diff options
| author | Claude Brisson <claude@renegat.net> | 2021-02-25 19:35:49 +0100 |
|---|---|---|
| committer | Claude Brisson <claude@renegat.net> | 2021-02-25 19:35:49 +0100 |
| commit | 836d28fa2e3884c72e20d7f42941c58031416b18 (patch) | |
| tree | 3687417c75794958121065a9f9e4ec3245ef2a7b /velocity-engine-core | |
| parent | 746440121f2006e68e154aef91d98557a681b196 (diff) | |
| download | apache-velocity-engine-836d28fa2e3884c72e20d7f42941c58031416b18.tar.gz | |
A lot of almost purely cosmetic code cleanups
Diffstat (limited to 'velocity-engine-core')
258 files changed, 1296 insertions, 622 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/Template.java b/velocity-engine-core/src/main/java/org/apache/velocity/Template.java index 4d685441..c5c0e1e4 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/Template.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/Template.java @@ -26,7 +26,6 @@ import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.RuntimeInstance; import org.apache.velocity.runtime.directive.Scope; import org.apache.velocity.runtime.directive.StopCommand; import org.apache.velocity.runtime.parser.ParseException; @@ -74,7 +73,7 @@ public class Template extends Resource */ private String scopeName = "template"; private boolean provideScope = false; - private Map<String, Object> macros = new ConcurrentHashMap(17, 0.7f); + private Map<String, Object> macros = new ConcurrentHashMap<>(17, 0.7f); private VelocityException errorCondition = null; @@ -104,6 +103,7 @@ public class Template extends Resource * @throws ParseErrorException if template cannot be parsed due * to syntax (or other) error. */ + @Override public boolean process() throws ResourceNotFoundException, ParseErrorException { @@ -159,7 +159,7 @@ public class Template extends Resource errorCondition = new ParseErrorException( pex, name); throw errorCondition; } - /** + /* * pass through runtime exceptions */ catch( RuntimeException e ) @@ -302,17 +302,17 @@ public class Template extends Resource InternalContextAdapterImpl ica = new InternalContextAdapterImpl(context); - /** + /* * Set the macro libraries */ - List<Template> libTemplates = new ArrayList(); + List<Template> libTemplates = new ArrayList<>(); ica.setMacroLibraries(libTemplates); if (macroLibraries != null) { for (String macroLibrary : macroLibraries) { - /** + /* * Build the macro library */ try diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java b/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java index 2ff326f0..9b4a6e4a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java @@ -107,7 +107,7 @@ public class VelocityContext public VelocityContext(Map<String, Object> context, Context innerContext) { super(innerContext); - this.context = (context == null ? new HashMap<String, Object>() : context); + this.context = (context == null ? new HashMap<>() : context); } /** @@ -117,7 +117,8 @@ public class VelocityContext * @param key name of value to get * @return value as object */ - public Object internalGet( String key ) + @Override + public Object internalGet(String key ) { return context.get( key ); } @@ -130,7 +131,8 @@ public class VelocityContext * @param value value to store * @return previous value of key as Object */ - public Object internalPut( String key, Object value ) + @Override + public Object internalPut(String key, Object value ) { return context.put( key, value ); } @@ -142,6 +144,7 @@ public class VelocityContext * @param key name of value to check * @return true if non-null value in store */ + @Override public boolean internalContainsKey(String key) { return context.containsKey( key ); @@ -152,6 +155,7 @@ public class VelocityContext * * @return keys as [] */ + @Override public String[] internalGetKeys() { return context.keySet().toArray(new String[context.size()]); @@ -164,6 +168,7 @@ public class VelocityContext * @param key name of value to remove * @return value removed */ + @Override public Object internalRemove(String key) { return context.remove( key ); @@ -174,6 +179,7 @@ public class VelocityContext * * @return A shallow copy of this <code>Context</code>. */ + @Override public Object clone() { VelocityContext clone = null; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java index e8a9768e..93751f3a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java @@ -26,7 +26,6 @@ import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeInstance; -import org.apache.velocity.util.ExtProperties; import org.slf4j.Logger; import java.io.Reader; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java index 473b0c81..1bbb49f3 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java @@ -55,15 +55,15 @@ import java.util.Set; */ public class EventCartridge { - private List<ReferenceInsertionEventHandler> referenceHandlers = new ArrayList(); + private List<ReferenceInsertionEventHandler> referenceHandlers = new ArrayList<>(); private MethodExceptionEventHandler methodExceptionHandler = null; - private List<IncludeEventHandler> includeHandlers = new ArrayList(); - private List<InvalidReferenceEventHandler> invalidReferenceHandlers = new ArrayList(); + private List<IncludeEventHandler> includeHandlers = new ArrayList<>(); + private List<InvalidReferenceEventHandler> invalidReferenceHandlers = new ArrayList<>(); /** * Ensure that handlers are not initialized more than once. */ - Set initializedHandlers = new HashSet(); + Set<EventHandler> initializedHandlers = new HashSet<>(); protected RuntimeServices rsvc = null; @@ -305,7 +305,7 @@ public class EventCartridge * @return value returned by handler * @since 2.0 */ - public Object methodException(Context context, Class claz, String method, Exception e, Info info) + public Object methodException(Context context, Class<?> claz, String method, Exception e, Info info) { if (methodExceptionHandler != null) { @@ -428,7 +428,7 @@ public class EventCartridge iec.attachEventCartridge(this); - /** + /* * while it's tempting to call setContext on each handler from here, * this needs to be done before each method call. This is * because the specific context will change as inner contexts diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java index cbb54be6..e5390020 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java @@ -94,7 +94,7 @@ public class EventHandlerUtil { * to be wrapped and propagated to app */ public static Object methodException(RuntimeServices rsvc, - InternalContextAdapter context, Class claz, String method, + InternalContextAdapter context, Class<?> claz, String method, Exception e, Info info) throws Exception { try 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 13a51532..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,6 +66,7 @@ public class PrintExceptions implements MethodExceptionEventHandler, RuntimeServ * @param info template name and line, column informations * @return an object to insert in the page */ + @Override public Object methodException(Context context, Class<?> claz, String method, Exception e, Info info) { boolean showTemplateInfo = rs.getBoolean(SHOW_TEMPLATE_INFO, 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 de09f84e..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<InvalidReferenceInfo> 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); @@ -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; } } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java b/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java index eae05477..2fba374a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java @@ -151,6 +151,7 @@ public abstract class AbstractContext extends InternalContextBase * @return Object that was replaced in the the Context if * applicable or null if not. */ + @Override public Object put(String key, Object value) { /* @@ -180,6 +181,7 @@ public abstract class AbstractContext extends InternalContextBase * @return The value corresponding to the provided key or null if * the key param is null. */ + @Override public Object get(String key) { /* @@ -213,6 +215,7 @@ public abstract class AbstractContext extends InternalContextBase * @param key The key to look for. * @return true if the key is in the context, false if not. */ + @Override public boolean containsKey(String key) { if (key == null) @@ -234,6 +237,7 @@ public abstract class AbstractContext extends InternalContextBase * @return Object[] of keys in the Context. Does not return * keys in chained context. */ + @Override public String[] getKeys() { return internalGetKeys(); @@ -246,6 +250,7 @@ public abstract class AbstractContext extends InternalContextBase * @return The value that the key was mapped to, or <code>null</code> * if unmapped. */ + @Override public Object remove(String key) { if (key == null) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java b/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java index 2d77c4df..46c4f018 100755 --- a/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java @@ -58,6 +58,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd * Return the inner / user context. * @return The inner / user context. */ + @Override public Context getInternalUserContext() { return wrappedContext.getInternalUserContext(); @@ -66,6 +67,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalWrapperContext#getBaseContext() */ + @Override public InternalContextAdapter getBaseContext() { return wrappedContext.getBaseContext(); @@ -77,6 +79,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd * @param key name of item to get * @return stored object or null */ + @Override public Object get(String key) { return wrappedContext.get(key); @@ -89,6 +92,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd * @param value object to set to key * @return old stored object */ + @Override public Object put(String key, Object value) { /* @@ -100,6 +104,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.Context#containsKey(java.lang.String) */ + @Override public boolean containsKey(String key) { return wrappedContext.containsKey(key); @@ -108,6 +113,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.Context#getKeys() */ + @Override public String[] getKeys() { return wrappedContext.getKeys(); @@ -116,6 +122,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.Context#remove(java.lang.String) */ + @Override public Object remove(String key) { return wrappedContext.remove(key); @@ -124,6 +131,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#pushCurrentTemplateName(java.lang.String) */ + @Override public void pushCurrentTemplateName(String s) { wrappedContext.pushCurrentTemplateName(s); @@ -132,6 +140,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#popCurrentTemplateName() */ + @Override public void popCurrentTemplateName() { wrappedContext.popCurrentTemplateName(); @@ -140,6 +149,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentTemplateName() */ + @Override public String getCurrentTemplateName() { return wrappedContext.getCurrentTemplateName(); @@ -148,6 +158,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#getTemplateNameStack() */ + @Override public String[] getTemplateNameStack() { return wrappedContext.getTemplateNameStack(); @@ -156,6 +167,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#pushCurrentMacroName(java.lang.String) */ + @Override public void pushCurrentMacroName(String s) { wrappedContext.pushCurrentMacroName(s); @@ -164,6 +176,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#popCurrentMacroName() */ + @Override public void popCurrentMacroName() { wrappedContext.popCurrentMacroName(); @@ -172,6 +185,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentMacroName() */ + @Override public String getCurrentMacroName() { return wrappedContext.getCurrentMacroName(); @@ -180,6 +194,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentMacroCallDepth() */ + @Override public int getCurrentMacroCallDepth() { return wrappedContext.getCurrentMacroCallDepth(); @@ -188,6 +203,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#getMacroNameStack() */ + @Override public String[] getMacroNameStack() { return wrappedContext.getMacroNameStack(); @@ -196,6 +212,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#icacheGet(java.lang.Object) */ + @Override public IntrospectionCacheData icacheGet(Object key) { return wrappedContext.icacheGet(key); @@ -204,6 +221,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#icachePut(java.lang.Object, org.apache.velocity.util.introspection.IntrospectionCacheData) */ + @Override public void icachePut(Object key, IntrospectionCacheData o) { wrappedContext.icachePut(key, o); @@ -212,6 +230,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#setMacroLibraries(List) */ + @Override public void setMacroLibraries(List<Template> macroLibraries) { wrappedContext.setMacroLibraries(macroLibraries); @@ -220,6 +239,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#getMacroLibraries() */ + @Override public List<Template> getMacroLibraries() { return wrappedContext.getMacroLibraries(); @@ -228,6 +248,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalEventContext#attachEventCartridge(org.apache.velocity.app.event.EventCartridge) */ + @Override public EventCartridge attachEventCartridge(EventCartridge ec) { return wrappedContext.attachEventCartridge(ec); @@ -236,6 +257,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalEventContext#getEventCartridge() */ + @Override public EventCartridge getEventCartridge() { return wrappedContext.getEventCartridge(); @@ -245,6 +267,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#setCurrentResource(org.apache.velocity.runtime.resource.Resource) */ + @Override public void setCurrentResource(Resource r) { wrappedContext.setCurrentResource(r); @@ -253,6 +276,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd /** * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentResource() */ + @Override public Resource getCurrentResource() { return wrappedContext.getCurrentResource(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java index 2ed86669..9587e510 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java @@ -117,7 +117,8 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#pushCurrentTemplateName(java.lang.String) */ - public void pushCurrentTemplateName( String s ) + @Override + public void pushCurrentTemplateName(String s ) { icb.pushCurrentTemplateName( s ); } @@ -125,6 +126,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#popCurrentTemplateName() */ + @Override public void popCurrentTemplateName() { icb.popCurrentTemplateName(); @@ -133,6 +135,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentTemplateName() */ + @Override public String getCurrentTemplateName() { return icb.getCurrentTemplateName(); @@ -141,6 +144,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#getTemplateNameStack() */ + @Override public String[] getTemplateNameStack() { return icb.getTemplateNameStack(); @@ -150,7 +154,8 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * @see org.apache.velocity.context.InternalHousekeepingContext#pushCurrentMacroName(java.lang.String) * @since 1.6 */ - public void pushCurrentMacroName( String s ) + @Override + public void pushCurrentMacroName(String s ) { icb.pushCurrentMacroName( s ); } @@ -159,6 +164,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * @see org.apache.velocity.context.InternalHousekeepingContext#popCurrentMacroName() * @since 1.6 */ + @Override public void popCurrentMacroName() { icb.popCurrentMacroName(); @@ -168,6 +174,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentMacroName() * @since 1.6 */ + @Override public String getCurrentMacroName() { return icb.getCurrentMacroName(); @@ -177,6 +184,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentMacroCallDepth() * @since 1.6 */ + @Override public int getCurrentMacroCallDepth() { return icb.getCurrentMacroCallDepth(); @@ -186,6 +194,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * @see org.apache.velocity.context.InternalHousekeepingContext#getMacroNameStack() * @since 1.6 */ + @Override public String[] getMacroNameStack() { return icb.getMacroNameStack(); @@ -194,7 +203,8 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#icacheGet(java.lang.Object) */ - public IntrospectionCacheData icacheGet( Object key ) + @Override + public IntrospectionCacheData icacheGet(Object key ) { return icb.icacheGet( key ); } @@ -202,7 +212,8 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#icachePut(java.lang.Object, org.apache.velocity.util.introspection.IntrospectionCacheData) */ - public void icachePut( Object key, IntrospectionCacheData o ) + @Override + public void icachePut(Object key, IntrospectionCacheData o ) { icb.icachePut( key, o ); } @@ -210,7 +221,8 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#setCurrentResource(org.apache.velocity.runtime.resource.Resource) */ - public void setCurrentResource( Resource r ) + @Override + public void setCurrentResource(Resource r ) { icb.setCurrentResource(r); } @@ -218,6 +230,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentResource() */ + @Override public Resource getCurrentResource() { return icb.getCurrentResource(); @@ -227,6 +240,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * @see org.apache.velocity.context.InternalHousekeepingContext#setMacroLibraries(List) * @since 1.6 */ + @Override public void setMacroLibraries(List<Template> macroLibraries) { icb.setMacroLibraries(macroLibraries); @@ -236,6 +250,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * @see org.apache.velocity.context.InternalHousekeepingContext#getMacroLibraries() * @since 1.6 */ + @Override public List<Template> getMacroLibraries() { return icb.getMacroLibraries(); @@ -246,6 +261,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.Context#put(java.lang.String, java.lang.Object) */ + @Override public Object put(String key, Object value) { return context.put( key , value ); @@ -254,6 +270,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.Context#get(java.lang.String) */ + @Override public Object get(String key) { return context.get( key ); @@ -262,6 +279,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.Context#containsKey(java.lang.String) */ + @Override public boolean containsKey(String key) { return context.containsKey( key ); @@ -270,6 +288,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.Context#getKeys() */ + @Override public String[] getKeys() { return context.getKeys(); @@ -278,6 +297,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.Context#remove(java.lang.String) */ + @Override public Object remove(String key) { return context.remove( key ); @@ -291,6 +311,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * we are wrapping * @return The internal user data context. */ + @Override public Context getInternalUserContext() { return context; @@ -303,6 +324,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter * be something else * @return The base context. */ + @Override public InternalContextAdapter getBaseContext() { return this; @@ -313,7 +335,8 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalEventContext#attachEventCartridge(org.apache.velocity.app.event.EventCartridge) */ - public EventCartridge attachEventCartridge( EventCartridge ec ) + @Override + public EventCartridge attachEventCartridge(EventCartridge ec ) { if (iec != null) { @@ -326,6 +349,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter /** * @see org.apache.velocity.context.InternalEventContext#getEventCartridge() */ + @Override public EventCartridge getEventCartridge() { if ( iec != null) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java b/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java index d573e8e3..7d58e0e5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextBase.java @@ -54,7 +54,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * cache for node/context specific introspection information */ - private Map<Object, IntrospectionCacheData> introspectionCache = new HashMap(33); + private Map<Object, IntrospectionCacheData> introspectionCache = new HashMap<>(33); /** * Template name stack. The stack top contains the current template name. @@ -81,14 +81,15 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * List for holding the macro libraries. Contains the macro library * template name as strings. */ - private List macroLibraries = null; + private List<Template> macroLibraries = null; /** * set the current template name on top of stack * * @param s current template name */ - public void pushCurrentTemplateName( String s ) + @Override + public void pushCurrentTemplateName(String s ) { templateNameStack.push(s); } @@ -96,6 +97,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * remove the current template name from stack */ + @Override public void popCurrentTemplateName() { templateNameStack.pop(); @@ -106,6 +108,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * * @return String current template name */ + @Override public String getCurrentTemplateName() { if ( templateNameStack.empty() ) @@ -119,6 +122,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * * @return String[] with the template name stack contents. */ + @Override public String[] getTemplateNameStack() { return templateNameStack.toArray(new String[templateNameStack.size()]); @@ -129,7 +133,8 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * * @param s current macro name */ - public void pushCurrentMacroName( String s ) + @Override + public void pushCurrentMacroName(String s ) { macroNameStack.push(s); } @@ -137,6 +142,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * remove the current macro name from stack */ + @Override public void popCurrentMacroName() { macroNameStack.pop(); @@ -147,6 +153,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * * @return String current macro name */ + @Override public String getCurrentMacroName() { if (macroNameStack.empty()) @@ -164,6 +171,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * * @return int current macro call depth */ + @Override public int getCurrentMacroCallDepth() { return macroNameStack.size(); @@ -174,6 +182,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * * @return String[] with the macro name stack contents. */ + @Override public String[] getMacroNameStack() { return macroNameStack.toArray(new String[macroNameStack.size()]); @@ -186,7 +195,8 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * @param key key to find in cache * @return cache object */ - public IntrospectionCacheData icacheGet( Object key ) + @Override + public IntrospectionCacheData icacheGet(Object key ) { return ( IntrospectionCacheData ) introspectionCache.get( key ); } @@ -198,7 +208,8 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC * @param key key * @param o IntrospectionCacheData object to place in cache */ - public void icachePut( Object key, IntrospectionCacheData o ) + @Override + public void icachePut(Object key, IntrospectionCacheData o ) { introspectionCache.put( key, o ); } @@ -206,7 +217,8 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * @see org.apache.velocity.context.InternalHousekeepingContext#setCurrentResource(org.apache.velocity.runtime.resource.Resource) */ - public void setCurrentResource( Resource r ) + @Override + public void setCurrentResource(Resource r ) { currentResource = r; } @@ -214,6 +226,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentResource() */ + @Override public Resource getCurrentResource() { return currentResource; @@ -222,6 +235,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * @see org.apache.velocity.context.InternalHousekeepingContext#setMacroLibraries(List) */ + @Override public void setMacroLibraries(List<Template> macroLibraries) { this.macroLibraries = macroLibraries; @@ -230,6 +244,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * @see org.apache.velocity.context.InternalHousekeepingContext#getMacroLibraries() */ + @Override public List<Template> getMacroLibraries() { return macroLibraries; @@ -239,7 +254,8 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * @see org.apache.velocity.context.InternalEventContext#attachEventCartridge(org.apache.velocity.app.event.EventCartridge) */ - public EventCartridge attachEventCartridge( EventCartridge ec ) + @Override + public EventCartridge attachEventCartridge(EventCartridge ec ) { EventCartridge temp = eventCartridge; @@ -251,6 +267,7 @@ class InternalContextBase implements InternalHousekeepingContext, InternalEventC /** * @see org.apache.velocity.context.InternalEventContext#getEventCartridge() */ + @Override public EventCartridge getEventCartridge() { return eventCartridge; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java b/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java index a88b14b2..a47f6e92 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java @@ -126,6 +126,7 @@ public class MethodInvocationException extends VelocityException implements Exte * @see ExtendedParseException#getColumnNumber() * @since 1.5 */ + @Override public int getColumnNumber() { return columnNumber; @@ -135,6 +136,7 @@ public class MethodInvocationException extends VelocityException implements Exte * @see ExtendedParseException#getLineNumber() * @since 1.5 */ + @Override public int getLineNumber() { return lineNumber; @@ -144,6 +146,7 @@ public class MethodInvocationException extends VelocityException implements Exte * @see ExtendedParseException#getTemplateName() * @since 1.5 */ + @Override public String getTemplateName() { return templateName; @@ -153,6 +156,7 @@ public class MethodInvocationException extends VelocityException implements Exte * @see Exception#getMessage() * @since 1.5 */ + @Override public String getMessage() { StringBuilder message = new StringBuilder(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java b/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java index 34c9c264..e86d11fd 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java @@ -265,6 +265,7 @@ public class ParseErrorException extends VelocityException /** * Return our custom message if we have one, else return the default message */ + @Override public String getMessage() { if (msg != null) return msg; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java b/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java index 20620cfe..20a60ec8 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java @@ -96,6 +96,7 @@ public class TemplateInitException extends VelocityException * Returns the Template name where this exception occurred. * @return the template name */ + @Override public String getTemplateName() { return templateName; @@ -105,6 +106,7 @@ public class TemplateInitException extends VelocityException * Returns the line number where this exception occurred. * @return the line number */ + @Override public int getLineNumber() { return line; @@ -114,6 +116,7 @@ public class TemplateInitException extends VelocityException * Returns the column number where this exception occurred. * @return the line number */ + @Override public int getColumnNumber() { return col; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java b/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java index 5ab3500e..43abfef5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java @@ -269,6 +269,7 @@ public class UnicodeInputStream * @throws IOException * @see java.io.InputStream#close() */ + @Override public void close() throws IOException { @@ -279,6 +280,7 @@ public class UnicodeInputStream * @throws IOException * @see java.io.InputStream#available() */ + @Override public int available() throws IOException { @@ -289,6 +291,7 @@ public class UnicodeInputStream * @param readlimit * @see java.io.InputStream#mark(int) */ + @Override public void mark(final int readlimit) { inputStream.mark(readlimit); @@ -298,6 +301,7 @@ public class UnicodeInputStream * @return mark supported * @see java.io.InputStream#markSupported() */ + @Override public boolean markSupported() { return inputStream.markSupported(); @@ -307,6 +311,7 @@ public class UnicodeInputStream * @return read char * @see java.io.InputStream#read() */ + @Override public int read() throws IOException { @@ -318,6 +323,7 @@ public class UnicodeInputStream * @return read chars count * @see java.io.InputStream#read(byte[]) */ + @Override public int read(final byte [] b) throws IOException { @@ -331,6 +337,7 @@ public class UnicodeInputStream * @return reac char * @see java.io.InputStream#read(byte[], int, int) */ + @Override public int read(final byte [] b, final int off, final int len) throws IOException { @@ -340,6 +347,7 @@ public class UnicodeInputStream /** * @see java.io.InputStream#reset() */ + @Override public void reset() throws IOException { @@ -351,6 +359,7 @@ public class UnicodeInputStream * @return skipped count * @see java.io.InputStream#skip(long) */ + @Override public long skip(final long n) throws IOException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java b/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java index 8f66008e..b9419689 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java @@ -148,6 +148,7 @@ public final class VelocityWriter extends Writer implements Filter * @throws IOException * */ + @Override public final void flush() throws IOException { flushBuffer(); @@ -162,6 +163,7 @@ public final class VelocityWriter extends Writer implements Filter * @throws IOException * */ + @Override public final void close() throws IOException { if (writer == null) return; @@ -182,6 +184,7 @@ public final class VelocityWriter extends Writer implements Filter * @throws IOException * */ + @Override public final void write(int c) throws IOException { if (bufferSize == 0) @@ -225,6 +228,7 @@ public final class VelocityWriter extends Writer implements Filter * @throws IOException * */ + @Override public final void write(char cbuf[], int off, int len) throws IOException { @@ -273,6 +277,7 @@ public final class VelocityWriter extends Writer implements Filter * @param buf * @throws IOException */ + @Override public final void write(char buf[]) throws IOException { write(buf, 0, buf.length); @@ -287,6 +292,7 @@ public final class VelocityWriter extends Writer implements Filter * @throws IOException * */ + @Override public final void write(String s, int off, int len) throws IOException { if (bufferSize == 0) @@ -315,6 +321,7 @@ public final class VelocityWriter extends Writer implements Filter * @param s * @throws IOException */ + @Override public final void write(String s) throws IOException { if (s != null) @@ -339,6 +346,7 @@ public final class VelocityWriter extends Writer implements Filter * The default implementation is to call the wrapped Writer's * write(String) method. */ + @Override public void writeReference(String ref) throws IOException { write(ref); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java index d59870a1..3934f2d0 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java @@ -42,6 +42,7 @@ public class ParserPoolImpl implements ParserPool { * Create the underlying "pool". * @param rsvc */ + @Override public void initialize(RuntimeServices rsvc) { log = rsvc.getLog("parser"); @@ -61,6 +62,7 @@ public class ParserPoolImpl implements ParserPool { * temporary one. * @return A parser Object. */ + @Override public Parser get() { return (Parser) pool.get(); @@ -70,6 +72,7 @@ public class ParserPoolImpl implements ParserPool { * Call the wrapped pool. * @param parser */ + @Override public void put(Parser parser) { parser.ReInit((CharStream) null); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java index 17fd3d50..ac62b870 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java @@ -63,7 +63,6 @@ import java.io.StringReader; import java.io.Writer; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import java.nio.charset.StandardCharsets; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; @@ -194,7 +193,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices /** * Scope names for which to provide scope control objects in the context */ - private Set<String> enabledScopeControls = new HashSet<String>(); + private Set<String> enabledScopeControls = new HashSet<>(); /** * Opaque reference to something specified by the @@ -232,7 +231,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * Configured parser class * @since 2.2 */ - private Constructor parserConstructor; + private Constructor<? extends Parser> parserConstructor; /** * Configured replacement characters in parser grammar @@ -263,6 +262,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * <li>Velocimacro System</li> * </ul> */ + @Override public synchronized void init() { if (!initialized && !initializing) @@ -353,6 +353,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return True if the RuntimeInstance has been successfully initialized. * @since 1.5 */ + @Override public boolean isInitialized() { return initialized; @@ -551,6 +552,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param key property key * @param value property value */ + @Override public void setProperty(String key, Object value) { if (overridingProperties == null) @@ -579,10 +581,10 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices + fileName + "'", e); } - Enumeration en = props.keys(); + Enumeration<String> en = props.keys(); while (en.hasMoreElements()) { - String key = en.nextElement().toString(); + String key = en.nextElement(); setProperty(key, props.get(key)); } } @@ -609,7 +611,8 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param configuration * @since 2.0 */ - public void setConfiguration( ExtProperties configuration) + @Override + public void setConfiguration(ExtProperties configuration) { if (overridingProperties == null) { @@ -644,6 +647,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param key * @param value */ + @Override public void addProperty(String key, Object value) { if (overridingProperties == null) @@ -660,6 +664,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * * @param key of property to clear */ + @Override public void clearProperty(String key) { if (overridingProperties != null) @@ -676,11 +681,12 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param key property to return * @return Value of the property or null if it does not exist. */ + @Override public Object getProperty(String key) { Object o = null; - /** + /* * Before initialization, check the user-entered properties first. */ if (!initialized && overridingProperties != null) @@ -688,7 +694,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices o = overridingProperties.get(key); } - /** + /* * After initialization, configuration will hold all properties. */ if (o == null) @@ -719,12 +725,12 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * Always lay down the default properties first as * to provide a solid base. */ - if (configuration.isInitialized() == false) + if ( !configuration.isInitialized() ) { setDefaultProperties(); } - if( overridingProperties != null) + if( overridingProperties != null ) { configuration.combine(overridingProperties); } @@ -736,6 +742,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * * @param p Velocity properties for initialization */ + @Override public void init(Properties p) { setConfiguration(ExtProperties.convertProperties(p)); @@ -748,6 +755,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * * @param configurationFile */ + @Override public void init(String configurationFile) { setProperties(configurationFile); @@ -841,7 +849,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices eventCartridge = new EventCartridge(); eventCartridge.setRuntimeServices(this); - /** + /* * For each type of event handler, get the class name, instantiate it, and store it. */ @@ -894,7 +902,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices } - private EventHandler initializeSpecificEventHandler(String classname, String paramName, Class EventHandlerInterface) + private EventHandler initializeSpecificEventHandler(String classname, String paramName, Class<?> EventHandlerInterface) { if ( classname != null && classname.length() > 0) { @@ -1102,6 +1110,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param name name of the directive * @return the {@link Directive} for that name */ + @Override public Directive getDirective(String name) { return runtimeDirectivesShared.get(name); @@ -1176,10 +1185,10 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * later on in this method when parser creation is tester. */ String parserClassName = getString(PARSER_CLASS, DEFAULT_PARSER_CLASS); - Class parserClass; + Class<? extends Parser> parserClass; try { - parserClass = ClassUtils.getClass(parserClassName); + parserClass = (Class<? extends Parser>)ClassUtils.getClass(parserClassName); } catch (ClassNotFoundException cnfe) { @@ -1276,12 +1285,13 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * * @return Parser javacc generated parser */ + @Override public Parser createNewParser() { requireInitialization(); try { - return (Parser)parserConstructor.newInstance((RuntimeServices)this); + return parserConstructor.newInstance(this); } catch (IllegalAccessException | InstantiationException | InvocationTargetException e) { @@ -1306,6 +1316,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return A root node representing the template as an AST tree. * @throws ParseException When the template could not be parsed. */ + @Override public SimpleNode parse(Reader reader, Template template) throws ParseException { @@ -1377,7 +1388,8 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @throws ResourceNotFoundException A referenced resource could not be loaded. * @since Velocity 1.6 */ - public boolean evaluate(Context context, Writer out, + @Override + public boolean evaluate(Context context, Writer out, String logTag, String instring) { return evaluate(context, out, logTag, new StringReader(instring)); @@ -1404,6 +1416,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @throws ResourceNotFoundException A referenced resource could not be loaded. * @since Velocity 1.6 */ + @Override public boolean evaluate(Context context, Writer writer, String logTag, Reader reader) { @@ -1477,7 +1490,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices { throw new ParseErrorException(pex, null); } - /** + /* * pass through application level runtime exceptions */ catch(RuntimeException e) @@ -1498,7 +1511,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices Object previous = ica.get(evaluateScopeName); context.put(evaluateScopeName, new Scope(this, previous)); } - /** + /* * optionally put the context in itself if asked so */ String self = getString(CONTEXT_AUTOREFERENCE_KEY); @@ -1568,6 +1581,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return true if Velocimacro exists and successfully invoked, false otherwise. * @since 1.6 */ + @Override public boolean invokeVelocimacro(final String vmName, String logTag, String[] params, final Context context, final Writer writer) @@ -1635,6 +1649,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @throws ParseErrorException if template cannot be parsed due * to syntax (or other) error. */ + @Override public Template getTemplate(String name) throws ResourceNotFoundException, ParseErrorException { @@ -1652,6 +1667,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @throws ParseErrorException if template cannot be parsed due * to syntax (or other) error. */ + @Override public Template getTemplate(String name, String encoding) throws ResourceNotFoundException, ParseErrorException { @@ -1673,6 +1689,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * from any available source. * @throws ParseErrorException When the template could not be parsed. */ + @Override public ContentResource getContent(String name) throws ResourceNotFoundException, ParseErrorException { @@ -1695,6 +1712,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * from any available source. * @throws ParseErrorException When the template could not be parsed. */ + @Override public ContentResource getContent(String name, String encoding) throws ResourceNotFoundException, ParseErrorException { @@ -1715,6 +1733,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param resourceName Name of template or content resource * @return class name of loader than can provide it */ + @Override public String getLoaderNameForResource(String resourceName) { requireInitialization(); @@ -1728,6 +1747,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return A Logger instance * @since 1.5 */ + @Override public Logger getLog() { return log; @@ -1740,6 +1760,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param childNamespace * @return child namespace logger */ + @Override public Logger getLog(String childNamespace) { Logger log = (Logger)getProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE); @@ -1756,6 +1777,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return LogContext object * @since 2.2 */ + @Override public LogContext getLogContext() { return logContext; @@ -1770,7 +1792,8 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * found in resource manager. * @return value of key or default */ - public String getString( String key, String defaultValue) + @Override + public String getString(String key, String defaultValue) { return configuration.getString(key, defaultValue); } @@ -1787,6 +1810,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * * @return VelocimacroProxy */ + @Override public Directive getVelocimacro(String vmName, Template renderingTemplate, Template template) { return vmFactory.getVelocimacro(vmName, renderingTemplate, template); @@ -1804,10 +1828,11 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return boolean True if added, false if rejected for some * reason (either parameters or permission settings) */ - public boolean addVelocimacro( String name, - Node macro, - List<Macro.MacroArg> macroArgs, - Template definingTemplate) + @Override + public boolean addVelocimacro(String name, + Node macro, + List<Macro.MacroArg> macroArgs, + Template definingTemplate) { return vmFactory.addVelocimacro(stringInterning ? name.intern() : name, macro, macroArgs, definingTemplate); } @@ -1819,6 +1844,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param template Template on which to look for the Macro. * @return True if VM by that name exists, false if not */ + @Override public boolean isVelocimacro(String vmName, Template template) { return vmFactory.isVelocimacro(stringInterning ? vmName.intern() : vmName, template); @@ -1841,6 +1867,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param key property key * @return value of key or null */ + @Override public String getString(String key) { return StringUtils.trim(configuration.getString(key)); @@ -1852,6 +1879,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param key Property key * @return value */ + @Override public int getInt(String key) { return configuration.getInt(key); @@ -1864,6 +1892,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param defaultValue The default value. * @return value */ + @Override public int getInt(String key, int defaultValue) { return configuration.getInt(key, defaultValue); @@ -1876,6 +1905,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param def The default value if property not found. * @return value of key or default value */ + @Override public boolean getBoolean(String key, boolean def) { return configuration.getBoolean(key, def); @@ -1887,6 +1917,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return Configuration object which houses the Velocity runtime * properties. */ + @Override public ExtProperties getConfiguration() { return configuration; @@ -1897,6 +1928,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return The event handlers for the application. * @since 1.5 */ + @Override public EventCartridge getApplicationEventCartridge() { return eventCartridge; @@ -1909,6 +1941,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param key * @return The application attribute for the given key. */ + @Override public Object getApplicationAttribute(Object key) { return applicationAttributes.get(key); @@ -1921,6 +1954,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @param o The new application attribute. * @return The old value of this attribute or null if it hasn't been set before. */ + @Override public Object setApplicationAttribute(Object key, Object o) { return applicationAttributes.put(key, o); @@ -1931,6 +1965,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * * @return The Uberspect object for this Instance. */ + @Override public Uberspect getUberspect() { return uberSpect; @@ -1941,6 +1976,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * * @return boolean */ + @Override public boolean useStringInterning() { return stringInterning; @@ -1950,6 +1986,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * get space gobbling mode * @return indentation mode */ + @Override public SpaceGobbling getSpaceGobbling() { return spaceGobbling; @@ -1959,6 +1996,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * get whether hyphens are allowed in identifiers * @return configured boolean flag */ + @Override public boolean isHyphenAllowedInIdentifiers() { return hyphenAllowedInIdentifiers; @@ -1970,6 +2008,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices * @return scope control enabled * @since 2.1 */ + @Override public boolean isScopeControlEnabled(String scopeName) { return enabledScopeControls.contains(scopeName); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java index 82974078..eec0e335 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java @@ -38,7 +38,6 @@ import org.apache.velocity.util.ExtProperties; import org.apache.velocity.util.introspection.Uberspect; import org.slf4j.Logger; -import java.io.IOException; import java.io.Reader; import java.io.Writer; import java.util.List; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java index 8000fa61..bc36c26f 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java @@ -388,16 +388,6 @@ public class RuntimeSingleton implements RuntimeConstants * Returns the appropriate VelocimacroProxy object if strVMname * is a valid current Velocimacro. * - * @param vmName Name of velocimacro requested - * @param templateName Name of the template that contains the velocimacro. - * @return The requested VelocimacroProxy. - * @see RuntimeInstance#getVelocimacro(String, String) - */ - - /** - * Returns the appropriate VelocimacroProxy object if strVMname - * is a valid current Velocimacro. - * * @param vmName Name of velocimacro requested * @param renderingTemplate Template we are currently rendering. This * information is needed when VM_PERM_ALLOW_INLINE_REPLACE_GLOBAL setting is true diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroManager.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroManager.java index da20fa1f..63dc92b9 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroManager.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroManager.java @@ -51,10 +51,10 @@ public class VelocimacroManager private boolean registerFromLib = false; /** reference to global namespace hash */ - private final Map globalNamespace; + private final Map<String, MacroEntry> globalNamespace; /** set of names of library templates/namespaces */ - private final Map libraries = new ConcurrentHashMap(17, 0.5f, 20); + private final Map<String, Template> libraries = new ConcurrentHashMap<>(17, 0.5f, 20); private RuntimeServices rsvc = null; @@ -75,7 +75,7 @@ public class VelocimacroManager * add the global namespace to the namespace hash. We always have that. */ - globalNamespace = new ConcurrentHashMap(101, 0.5f, 20); + globalNamespace = new ConcurrentHashMap<>(101, 0.5f, 20); this.rsvc = rsvc; } @@ -115,7 +115,7 @@ public class VelocimacroManager boolean isLib = true; - MacroEntry exist = (MacroEntry) globalNamespace.get(vmName); + MacroEntry exist = globalNamespace.get(vmName); if (registerFromLib) { @@ -137,7 +137,6 @@ public class VelocimacroManager if ( !isLib && usingNamespaces() ) { definingTemplate.getMacros().put(vmName, me); - return true; } else { @@ -158,8 +157,8 @@ public class VelocimacroManager globalNamespace.put(vmName, me); - return true; } + return true; } /** @@ -197,7 +196,7 @@ public class VelocimacroManager } } - MacroEntry me = (MacroEntry) globalNamespace.get(vmName); + MacroEntry me = globalNamespace.get(vmName); if (me != null) { @@ -282,7 +281,7 @@ public class VelocimacroManager return null; } - MacroEntry me = (MacroEntry) globalNamespace.get(vmName); + MacroEntry me = globalNamespace.get(vmName); if (me != null) { @@ -307,10 +306,7 @@ public class VelocimacroManager */ private static class MacroEntry { - private final String vmName; - private final List<Macro.MacroArg> macroArgs; private final String sourceTemplate; - private SimpleNode nodeTree = null; private boolean fromLibrary = false; private VelocimacroProxy vp; @@ -318,16 +314,13 @@ public class VelocimacroManager List<Macro.MacroArg> macroArgs, final String sourceTemplate, RuntimeServices rsvc) { - this.vmName = vmName; - this.macroArgs = macroArgs; - this.nodeTree = (SimpleNode)macro; this.sourceTemplate = sourceTemplate; vp = new VelocimacroProxy(); vp.init(rsvc); - vp.setName(this.vmName); - vp.setMacroArgs(this.macroArgs); - vp.setNodeTree(this.nodeTree); + vp.setName(vmName); + vp.setMacroArgs(macroArgs); + vp.setNodeTree((SimpleNode)macro); vp.setLocation(macro.getLine(), macro.getColumn(), macro.getTemplate()); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java index 72c9c13f..e2d34a78 100755 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java @@ -53,6 +53,7 @@ public abstract class Block extends Directive * Return type of this directive. * @return type, DirectiveConstants.BLOCK or DirectiveConstants.LINE */ + @Override public int getType() { return BLOCK; @@ -64,6 +65,7 @@ public abstract class Block extends Directive * @param context * @param node */ + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException { @@ -71,7 +73,7 @@ public abstract class Block extends Directive log = rsvc.getLog(); - /** + /* * No checking is done. We just grab the last child node and assume * that it's the block! */ @@ -157,6 +159,7 @@ public abstract class Block extends Directive * @param writer * @return success status */ + @Override public boolean render(InternalContextAdapter context, Writer writer) { depth++; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/BlockMacro.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/BlockMacro.java index bc222c7d..713dc5ce 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/BlockMacro.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/BlockMacro.java @@ -62,6 +62,7 @@ public class BlockMacro extends Block private String name; private RuntimeMacro macro; + @Override public String getName() { return key; @@ -72,6 +73,7 @@ public class BlockMacro extends Block * #@myMacro() ... #end block that the scope in question * would be used. */ + @Override public String getScopeName() { return name; @@ -113,6 +115,7 @@ public class BlockMacro extends Block * @return True if the directive rendered successfully. * @throws IOException */ + @Override public boolean render(InternalContextAdapter context, Writer writer, Node node) throws IOException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Break.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Break.java index 220f521b..053afd9e 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Break.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Break.java @@ -45,6 +45,7 @@ public class Break extends Directive * Return name of this directive. * @return The name of this directive. */ + @Override public String getName() { return "break"; @@ -54,6 +55,7 @@ public class Break extends Directive * Return type of this directive. * @return The type of this directive. */ + @Override public int getType() { return LINE; @@ -63,6 +65,7 @@ public class Break extends Directive * Since there is no processing of content, * there is never a need for an internal scope. */ + @Override public boolean isScopeProvided() { return false; @@ -82,6 +85,7 @@ public class Break extends Directive * its content. * @return never, always throws a StopCommand or Exception */ + @Override public boolean render(InternalContextAdapter context, Writer writer, Node node) { if (!scoped) @@ -108,7 +112,8 @@ public class Break extends Directive /** * Called by the parser to validate the argument types */ - public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) + @Override + public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) throws ParseException { if (argtypes.size() > 1) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java index 35f4d5cd..f1e90f6a 100755 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java @@ -47,6 +47,7 @@ public class Define extends Block /** * Return name of this directive. */ + @Override public String getName() { return "define"; @@ -55,6 +56,7 @@ public class Define extends Block /** * simple init - get the key */ + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException { @@ -87,6 +89,7 @@ public class Define extends Block * directive.render() simply makes an instance of the Block inner class * and places it into the context as indicated. */ + @Override public boolean render(InternalContextAdapter context, Writer writer, Node node) { /* put a Block.Reference instance into the context, @@ -99,7 +102,8 @@ public class Define extends Block /** * Called by the parser to validate the argument types */ - public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) + @Override + public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) throws ParseException { if (argtypes.size() != 1) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java index 2cbf2d78..9d938f78 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java @@ -25,7 +25,6 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.TemplateInitException; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; import org.apache.velocity.runtime.parser.Token; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java index c261ba6e..89ccdb6b 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java @@ -51,6 +51,7 @@ public class Evaluate extends Directive * Return name of this directive. * @return The name of this directive. */ + @Override public String getName() { return "evaluate"; @@ -60,6 +61,7 @@ public class Evaluate extends Directive * Return type of this directive. * @return The type of this directive. */ + @Override public int getType() { return LINE; @@ -72,13 +74,14 @@ public class Evaluate extends Directive * @param node * @throws TemplateInitException */ + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException { super.init( rs, context, node ); - /** + /* * Check that there is exactly one argument and it is a string or reference. */ @@ -134,8 +137,9 @@ public class Evaluate extends Directive * @throws ParseErrorException * @throws MethodInvocationException */ + @Override public boolean render(InternalContextAdapter context, Writer writer, - Node node) throws IOException, ResourceNotFoundException, + Node node) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java index 19730baf..dd336eea 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java @@ -27,7 +27,6 @@ import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.*; -import org.apache.velocity.runtime.parser.node.ParserTreeConstants; import org.apache.velocity.util.StringUtils; import org.apache.velocity.util.introspection.Info; @@ -52,6 +51,7 @@ public class Foreach extends Directive * Return name of this directive. * @return The name of this directive. */ + @Override public String getName() { return "foreach"; @@ -61,6 +61,7 @@ public class Foreach extends Directive * Return type of this directive. * @return The type of this directive. */ + @Override public int getType() { return BLOCK; @@ -101,6 +102,7 @@ public class Foreach extends Directive * @param node * @throws TemplateInitException */ + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException { @@ -215,6 +217,7 @@ public class Foreach extends Directive * @return True if the directive rendered successfully. * @throws IOException */ + @Override public boolean render(InternalContextAdapter context, Writer writer, Node node) throws IOException { @@ -293,7 +296,7 @@ public class Foreach extends Directive /* * closes the iterator if it implements the Closeable interface */ - if (i != null && i instanceof Closeable && i != iterable) /* except if the iterable is the iterator itself */ + if (i instanceof Closeable && i != iterable) /* except if the iterable is the iterator itself */ { ((Closeable)i).close(); } @@ -329,7 +332,8 @@ public class Foreach extends Directive * We do not allow a word token in any other arg position except for the 2nd since * we are looking for the pattern #foreach($foo in $bar). */ - public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) + @Override + public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) throws ParseException { if (argtypes.size() < 3) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java index f3a603b7..58fe19b8 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java @@ -79,6 +79,7 @@ public class Include extends InputBase * Return name of this directive. * @return The name of this directive. */ + @Override public String getName() { return "include"; @@ -88,6 +89,7 @@ public class Include extends InputBase * Return type of this directive. * @return The type of this directive. */ + @Override public int getType() { return LINE; @@ -97,6 +99,7 @@ public class Include extends InputBase * Since there is no processing of content, * there is never a need for an internal scope. */ + @Override public boolean isScopeProvided() { return false; @@ -110,6 +113,7 @@ public class Include extends InputBase * @param node * @throws TemplateInitException */ + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException @@ -139,8 +143,9 @@ public class Include extends InputBase * @throws MethodInvocationException * @throws ResourceNotFoundException */ + @Override public boolean render(InternalContextAdapter context, - Writer writer, Node node) + Writer writer, Node node) throws IOException, MethodInvocationException, ResourceNotFoundException { @@ -247,7 +252,7 @@ public class Include extends InputBase throw rnfe; } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java index 44d3f08c..973c3358 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java @@ -21,10 +21,8 @@ package org.apache.velocity.runtime.directive; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.TemplateInitException; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.ParseException; -import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.Node; import org.apache.velocity.runtime.parser.node.ParserTreeConstants; @@ -60,6 +58,7 @@ public class Macro extends Directive * Return name of this directive. * @return The name of this directive. */ + @Override public String getName() { return "macro"; @@ -69,6 +68,7 @@ public class Macro extends Directive * Return type of this directive. * @return The type of this directive. */ + @Override public int getType() { return BLOCK; @@ -78,6 +78,7 @@ public class Macro extends Directive * Since this class does no processing of content, * there is never a need for an internal scope. */ + @Override public boolean isScopeProvided() { return false; @@ -92,8 +93,9 @@ public class Macro extends Directive * @return True if the directive rendered successfully. * @throws IOException */ + @Override public boolean render(InternalContextAdapter context, - Writer writer, Node node) + Writer writer, Node node) throws IOException { /* @@ -106,6 +108,7 @@ public class Macro extends Directive /** * @see org.apache.velocity.runtime.directive.Directive#init(org.apache.velocity.runtime.RuntimeServices, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.Node) */ + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException @@ -123,7 +126,8 @@ public class Macro extends Directive /** * Check the argument types of a macro call, called by the parser to do validation */ - public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) + @Override + public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) throws ParseException { if (argtypes.size() < 1) @@ -196,7 +200,7 @@ public class Macro extends Directive int numArgs = node.jjtGetNumChildren(); numArgs--; // avoid the block tree... - ArrayList<MacroArg> macroArgs = new ArrayList(); + ArrayList<MacroArg> macroArgs = new ArrayList<>(); for (int i = 0; i < numArgs; i++) { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/MacroParseException.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/MacroParseException.java index 04dc321f..0ce9a5f8 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/MacroParseException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/MacroParseException.java @@ -61,6 +61,7 @@ public class MacroParseException * @return The Template name where this exception occured. * @since 1.5 */ + @Override public String getTemplateName() { return templateName; @@ -71,6 +72,7 @@ public class MacroParseException * @return The line number where this exception occured. * @since 1.5 */ + @Override public int getLineNumber() { if ((currentToken != null) && (currentToken.next != null)) @@ -92,6 +94,7 @@ public class MacroParseException * @return The column number where this exception occured. * @since 1.5 */ + @Override public int getColumnNumber() { if ((currentToken != null) && (currentToken.next != null)) @@ -120,6 +123,7 @@ public class MacroParseException * @return the current message. * @since 1.5 */ + @Override public String getMessage() { if (!specialConstructor) @@ -140,9 +144,9 @@ public class MacroParseException maxSize = expectedTokenSequence.length; } - for (int j = 0; j < expectedTokenSequence.length; j++) + for (int i : expectedTokenSequence) { - expected.append(tokenImage[expectedTokenSequence[j]]).append(" "); + expected.append(tokenImage[i]).append(" "); } if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java index a4106ad6..1d4b9e7b 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java @@ -77,6 +77,7 @@ public class Parse extends InputBase * Return name of this directive. * @return The name of this directive. */ + @Override public String getName() { return "parse"; @@ -87,6 +88,7 @@ public class Parse extends InputBase * can use the same scope reference, whether rendered via #parse * or direct merge. */ + @Override public String getScopeName() { return "template"; @@ -96,6 +98,7 @@ public class Parse extends InputBase * Return type of this directive. * @return The type of this directive. */ + @Override public int getType() { return LINE; @@ -108,6 +111,7 @@ public class Parse extends InputBase * @param node * @throws TemplateInitException */ + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException { @@ -131,8 +135,9 @@ public class Parse extends InputBase * @throws ParseErrorException * @throws MethodInvocationException */ - public boolean render( InternalContextAdapter context, - Writer writer, Node node) + @Override + public boolean render(InternalContextAdapter context, + Writer writer, Node node) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException { @@ -195,7 +200,7 @@ public class Parse extends InputBase StringBuilder path = new StringBuilder(); for (String aTemplateStack : templateStack) { - path.append(" > " + aTemplateStack); + path.append(" > ").append(aTemplateStack); } log.error("Max recursion depth reached ({}). File stack: {}", templateStack.length, path); @@ -233,7 +238,7 @@ public class Parse extends InputBase arg, StringUtils.formatFileString(this)); throw pee; } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -250,12 +255,12 @@ public class Parse extends InputBase throw new VelocityException(msg, e, rsvc.getLogContext().getStackTrace()); } - /** + /* * Add the template name to the macro libraries list */ List<Template> macroLibraries = context.getMacroLibraries(); - /** + /* * if macroLibraries are not set create a new one */ if (macroLibraries == null) @@ -285,12 +290,12 @@ public class Parse extends InputBase throw stop; } } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) { - /** + /* * Log #parse errors so the user can track which file called which. */ log.error("Exception rendering #parse({}) at {}", @@ -321,7 +326,8 @@ public class Parse extends InputBase /** * Called by the parser to validate the argument types */ - public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) + @Override + public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) throws ParseException { if (argtypes.size() != 1) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java index 77b9c5ce..95ddb165 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java @@ -30,7 +30,6 @@ import org.apache.velocity.runtime.Renderable; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeConstants.SpaceGobbling; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.ASTDirective; import org.apache.velocity.runtime.parser.node.Node; @@ -135,7 +134,7 @@ public class RuntimeMacro extends Directive macroName = rsvc.useStringInterning() ? macroName.intern() : macroName; this.node = node; - /** + /* * Apply strictRef setting only if this really looks like a macro, * so strict mode doesn't balk at things like #E0E0E0 in a template. * compare with ")" is a simple #foo() style macro, comparing to @@ -283,7 +282,7 @@ public class RuntimeMacro extends Directive VelocimacroProxy vmProxy = null; Template renderingTemplate = (Template)context.getCurrentResource(); - /** + /* * first look in the source template */ Object o = rsvc.getVelocimacro(macroName, renderingTemplate, getTemplate()); @@ -295,7 +294,7 @@ public class RuntimeMacro extends Directive vmProxy = (VelocimacroProxy)o; } - /** + /* * if not found, look in the macro libraries. */ if (vmProxy == null) @@ -341,7 +340,7 @@ public class RuntimeMacro extends Directive } catch (RuntimeException | IOException e) { - /** + /* * We catch, the exception here so that we can record in * the logs the template and line number of the macro call * which generate the exception. This information is @@ -363,7 +362,7 @@ public class RuntimeMacro extends Directive + StringUtils.formatFileString(node), null, rsvc.getLogContext().getStackTrace()); } - /** + /* * If we cannot find an implementation write the literal text */ writer.write(getLiteral()); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java index cba37d60..7e7d226e 100755 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java @@ -20,7 +20,6 @@ package org.apache.velocity.runtime.directive; */ import org.apache.velocity.Template; -import org.apache.velocity.runtime.parser.Parser; import java.util.AbstractMap; import java.util.HashMap; @@ -33,7 +32,7 @@ import java.util.Set; * @author Nathan Bubna * @version $Id$ */ -public class Scope extends AbstractMap +public class Scope extends AbstractMap<Object, Object> { private static final String setReturnValue = ""; private Map<Object, Object> storage; @@ -66,7 +65,7 @@ public class Scope extends AbstractMap { if (storage == null) { - storage = new HashMap(); + storage = new HashMap<>(); } return storage; } @@ -74,6 +73,7 @@ public class Scope extends AbstractMap /** * @return entry set */ + @Override public Set<Map.Entry<Object, Object>> entrySet() { return getStorage().entrySet(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java index 1ffe0170..c2caf388 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java @@ -49,6 +49,7 @@ public class Stop extends Directive * Return name of this directive. * @return The name of this directive. */ + @Override public String getName() { return "stop"; @@ -58,6 +59,7 @@ public class Stop extends Directive * Return type of this directive. * @return The type of this directive. */ + @Override public int getType() { return LINE; @@ -67,11 +69,13 @@ public class Stop extends Directive * Since there is no processing of content, * there is never a need for an internal scope. */ + @Override public boolean isScopeProvided() { return false; } + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) { super.init(rs, context, node); @@ -96,7 +100,8 @@ public class Stop extends Directive /** * Called by the parser to check the argument types */ - public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) + @Override + public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName) throws ParseException { int kids = argtypes.size(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java index 92f9a1b4..37768a57 100755 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java @@ -54,6 +54,7 @@ public class StopCommand extends Error this.stopMe = stopMe; } + @Override public String getMessage() { if (stopMe != null) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java index ee4bddd3..0cad8a43 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java @@ -64,6 +64,7 @@ public class VelocimacroProxy extends Directive * Return name of this Velocimacro. * @return The name of this Velocimacro. */ + @Override public String getName() { return macroName; @@ -73,6 +74,7 @@ public class VelocimacroProxy extends Directive * Velocimacros are always LINE type directives. * @return The type of this directive. */ + @Override public int getType() { return LINE; @@ -171,6 +173,7 @@ public class VelocimacroProxy extends Directive * @return success status * @throws IOException */ + @Override public boolean render(InternalContextAdapter context, Writer writer, Node node) throws IOException { @@ -422,7 +425,7 @@ public class VelocimacroProxy extends Directive Deque<String> literalsStack = (Deque<String>)context.get(literalArgArray[i]); if (literalsStack == null) { - literalsStack = new LinkedList(); + literalsStack = new LinkedList<>(); context.put(literalArgArray[i], literalsStack); } /* Reflects the strange 1.7 behavor... */ diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java index 77af0de2..aaefae9b 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.runtime.directive.contrib; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.runtime.directive.contrib; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.TemplateInitException; @@ -46,16 +47,19 @@ public class For extends Foreach protected String counterName; protected int counterInitialValue; + @Override public String getName() { return "for"; } + @Override public int getType() { return BLOCK; } + @Override public void init(RuntimeServices rs, InternalContextAdapter context, Node node) throws TemplateInitException { @@ -110,8 +114,9 @@ public class For extends Foreach * We do not allow a word token in any other arg position except for the 2nd * since we are looking for the pattern #foreach($foo in $bar). */ + @Override public void checkArgs(ArrayList<Integer> argtypes, Token t, - String templateName) throws ParseException + String templateName) throws ParseException { super.checkArgs(argtypes, t, templateName); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/CharStream.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/CharStream.java index de96c43f..9e7ee389 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/CharStream.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/CharStream.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.runtime.parser; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,7 +19,6 @@ * under the License. */ /* Generated By:JavaCC: Do not edit this line. CharStream.java Version 2.1 */ -package org.apache.velocity.runtime.parser; /** * This interface describes a character stream that maintains line and diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/LogContext.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/LogContext.java index 75056383..c6738cd5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/LogContext.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/LogContext.java @@ -28,7 +28,6 @@ import org.slf4j.MDC; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; -import java.util.Iterator; import java.util.List; /** @@ -64,7 +63,7 @@ public class LogContext @Override public Deque<StackElement> initialValue() { - return new ArrayDeque<StackElement>(); + return new ArrayDeque<>(); } }; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/ParseException.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/ParseException.java index 5cc68c62..4a8d5769 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/ParseException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/ParseException.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.runtime.parser; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,7 +19,6 @@ * under the License. */ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */ -package org.apache.velocity.runtime.parser; /** * This exception is thrown when parse errors are encountered. @@ -132,6 +133,7 @@ public class ParseException extends Exception { * gets displayed. * @return message */ + @Override public String getMessage() { if (!specialConstructor) { return super.getMessage(); @@ -144,9 +146,9 @@ public class ParseException extends Exception { { maxSize = expectedTokenSequence.length; } - for (int j = 0; j < expectedTokenSequence.length; j++) + for (int i : expectedTokenSequence) { - expected += tokenImage[expectedTokenSequence[j]] + " "; + expected += tokenImage[i] + " "; } if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/TemplateParseException.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/TemplateParseException.java index be511d63..acb20a97 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/TemplateParseException.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/TemplateParseException.java @@ -112,6 +112,7 @@ public class TemplateParseException * returns the Template name where this exception occurred. * @return The Template name where this exception occurred. */ + @Override public String getTemplateName() { return templateName; @@ -121,6 +122,7 @@ public class TemplateParseException * returns the line number where this exception occurred. * @return The line number where this exception occurred. */ + @Override public int getLineNumber() { if ((currentToken != null) && (currentToken.next != null)) @@ -137,6 +139,7 @@ public class TemplateParseException * returns the column number where this exception occurred. * @return The column number where this exception occurred. */ + @Override public int getColumnNumber() { if ((currentToken != null) && (currentToken.next != null)) @@ -160,6 +163,7 @@ public class TemplateParseException * gets displayed. * @return The error message. */ + @Override public String getMessage() { if (!specialConstructor) @@ -180,9 +184,9 @@ public class TemplateParseException maxSize = expectedTokenSequence.length; } - for (int j = 0; j < expectedTokenSequence.length; j++) + for (int i : expectedTokenSequence) { - expected.append(tokenImage[expectedTokenSequence[j]]).append(" "); + expected.append(tokenImage[i]).append(" "); } if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java index e6a06151..c5133749 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java @@ -20,21 +20,19 @@ package org.apache.velocity.runtime.parser; */ /** - * NOTE : This class was originally an ASCII_CharStream autogenerated + * <p>An implementation of interface CharStream, where the stream is assumed to + * contain only ASCII characters (without unicode processing).</p> + * + * <p>NOTE : This class was originally an ASCII_CharStream autogenerated * by Javacc. It was then modified via changing class name with appropriate - * fixes for CTORS, and mods to readChar(). + * fixes for CTORS, and mods to readChar().</p> * - * This is safe because we *always* use Reader with this class, and never a + * <p>This is safe because we *always* use Reader with this class, and never a * InputStream. This guarantees that we have a correct stream of 16-bit * chars - all encoding transformations have been done elsewhere, so we - * believe that there is no risk in doing this. Time will tell :) - */ - -/** - * An implementation of interface CharStream, where the stream is assumed to - * contain only ASCII characters (without unicode processing). + * believe that there is no risk in doing this. Time will tell :)</p> + * */ - public final class VelocityCharStream implements CharStream { @@ -186,6 +184,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#BeginToken() */ + @Override public final char BeginToken() throws java.io.IOException { tokenBegin = -1; @@ -240,6 +239,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#readChar() */ + @Override public final char readChar() throws java.io.IOException { if (inBuf > 0) @@ -269,6 +269,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#getEndColumn() */ + @Override public final int getEndColumn() { return bufcolumn[bufpos]; @@ -277,6 +278,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#getEndLine() */ + @Override public final int getEndLine() { return bufline[bufpos]; @@ -285,6 +287,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#getBeginColumn() */ + @Override public final int getBeginColumn() { return bufcolumn[tokenBegin]; @@ -293,6 +296,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#getBeginLine() */ + @Override public final int getBeginLine() { return bufline[tokenBegin]; @@ -301,6 +305,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#backup(int) */ + @Override public final void backup(int amount) { @@ -421,6 +426,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#GetImage() */ + @Override public final String GetImage() { if (bufpos >= tokenBegin) @@ -437,6 +443,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#GetSuffix(int) */ + @Override public final char[] GetSuffix(int len) { char[] ret = new char[len]; @@ -458,6 +465,7 @@ implements CharStream /** * @see org.apache.velocity.runtime.parser.CharStream#Done() */ + @Override public void Done() { buffer = null; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java index 94598fbb..119c4865 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java @@ -81,6 +81,7 @@ public class ASTAddNode extends ASTMathNode return "+"; } + @Override public Number perform(Number left, Number right, InternalContextAdapter context) { return MathUtils.add(left, right); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java index c47a3c73..2338d40f 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java @@ -59,6 +59,7 @@ public class ASTAndNode extends ASTLogicalOperator /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -72,6 +73,7 @@ public class ASTAndNode extends ASTLogicalOperator * @return The value of the expression. * @throws MethodInvocationException */ + @Override public Object value(InternalContextAdapter context) throws MethodInvocationException { @@ -89,7 +91,8 @@ public class ASTAndNode extends ASTLogicalOperator * @return True if both sides are true. * @throws MethodInvocationException */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { Node left = jjtGetChild(0); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java index 673d1510..2cc2973d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java @@ -48,6 +48,7 @@ public class ASTAssignment extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -57,7 +58,8 @@ public class ASTAssignment extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBinaryOperator.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBinaryOperator.java index 50f622fa..8b776eaf 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBinaryOperator.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBinaryOperator.java @@ -20,7 +20,8 @@ public abstract class ASTBinaryOperator extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java index 48cf1d68..c8358ed5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java @@ -67,6 +67,7 @@ public class ASTBlock extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -76,7 +77,8 @@ public class ASTBlock extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens @@ -127,7 +129,8 @@ public class ASTBlock extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException, MethodInvocationException, ResourceNotFoundException, ParseErrorException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java index 56a5141c..b2d3ba2a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java @@ -61,6 +61,7 @@ public class ASTComment extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -72,6 +73,7 @@ public class ASTComment extends SimpleNode * @param data * @return The data object. */ + @Override public Object init(InternalContextAdapter context, Object data) { Token t = getFirstToken(); @@ -96,7 +98,8 @@ public class ASTComment extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException, MethodInvocationException, ParseErrorException, ResourceNotFoundException { writer.write(carr); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java index 1e11a947..721aa23d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java @@ -57,6 +57,7 @@ public abstract class ASTComparisonNode extends ASTBinaryOperator /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -65,6 +66,7 @@ public abstract class ASTComparisonNode extends ASTBinaryOperator /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ + @Override public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { Object left = jjtGetChild(0).value(context); @@ -135,6 +137,7 @@ public abstract class ASTComparisonNode extends ASTBinaryOperator * get the string representing the mathematical operator * @return operator string */ + @Override public abstract String getLiteralOperator(); /** @@ -166,6 +169,7 @@ public abstract class ASTComparisonNode extends ASTBinaryOperator /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ + @Override public Object value(InternalContextAdapter context) throws MethodInvocationException { return evaluate(context); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java index 0425ff45..925edf45 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java @@ -88,6 +88,7 @@ public class ASTDirective extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -96,7 +97,8 @@ public class ASTDirective extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public synchronized Object init( InternalContextAdapter context, Object data) + @Override + public synchronized Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Token t; @@ -278,7 +280,8 @@ public class ASTDirective extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException,MethodInvocationException, ResourceNotFoundException, ParseErrorException { SpaceGobbling spaceGobbling = rsvc.getSpaceGobbling(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirectiveAssign.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirectiveAssign.java index 67efed75..66f74266 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirectiveAssign.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirectiveAssign.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.runtime.parser.node; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.runtime.parser.node; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.TemplateInitException; @@ -39,7 +40,8 @@ public class ASTDirectiveAssign extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); saveTokenImages(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java index 317a86b8..e070a78a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java @@ -60,6 +60,7 @@ public class ASTDivNode extends ASTMathNode return "/"; } + @Override public Number perform(Number left, Number right, InternalContextAdapter context) { /* diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java index 61f92257..5a2411bb 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java @@ -57,6 +57,7 @@ public class ASTEQNode extends ASTComparisonNode return "=="; } + @Override public boolean numberTest(int compareResult) { return compareResult == 0; @@ -65,7 +66,7 @@ public class ASTEQNode extends ASTComparisonNode @Override public boolean compareNonNumber(Object left, Object right) { - /** + /* * if both are not null, then assume that if one class * is a subclass of the other that we should use the equals operator */ diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java index b2c006eb..78334c33 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java @@ -62,7 +62,8 @@ public class ASTElseIfStatement extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens @@ -72,6 +73,7 @@ public class ASTElseIfStatement extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -88,7 +90,8 @@ public class ASTElseIfStatement extends SimpleNode * @return True if all children are true. * @throws MethodInvocationException */ - public boolean evaluate ( InternalContextAdapter context) + @Override + public boolean evaluate (InternalContextAdapter context) throws MethodInvocationException { return jjtGetChild(0).evaluate(context); @@ -97,7 +100,8 @@ public class ASTElseIfStatement extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException,MethodInvocationException, ResourceNotFoundException, ParseErrorException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java index 5f3ac669..378501cd 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java @@ -55,6 +55,7 @@ public class ASTElseStatement extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -66,7 +67,8 @@ public class ASTElseStatement extends SimpleNode * @param context * @return Always true. */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) { return true; } @@ -75,7 +77,8 @@ public class ASTElseStatement extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java index 452b275b..67539ec0 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java @@ -61,6 +61,7 @@ public class ASTEscape extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -69,7 +70,8 @@ public class ASTEscape extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) + @Override + public Object init(InternalContextAdapter context, Object data) { ctext = val.toCharArray(); return data; @@ -78,7 +80,8 @@ public class ASTEscape extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException { writer.write(ctext); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java index 962da754..3a7ba3a7 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java @@ -59,6 +59,7 @@ public class ASTEscapedDirective extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -67,6 +68,7 @@ public class ASTEscapedDirective extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ + @Override public boolean render(InternalContextAdapter context, Writer writer) throws IOException { @@ -78,7 +80,8 @@ public class ASTEscapedDirective extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); saveTokenImages(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java index 2dc36721..6b11698a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java @@ -49,6 +49,7 @@ public class ASTExpression extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -57,7 +58,8 @@ public class ASTExpression extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { return jjtGetChild(0).evaluate(context); @@ -66,7 +68,8 @@ public class ASTExpression extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) throws MethodInvocationException { return jjtGetChild(0).value(context); @@ -76,7 +79,8 @@ public class ASTExpression extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); saveTokenImages(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java index c55c3c2a..aed9d6f5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java @@ -50,6 +50,7 @@ public class ASTFalse extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -58,7 +59,8 @@ public class ASTFalse extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) { return false; } @@ -66,7 +68,8 @@ public class ASTFalse extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) { return value; } @@ -75,7 +78,8 @@ public class ASTFalse extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java index 057e4cf6..1f13c30a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java @@ -61,6 +61,7 @@ public class ASTFloatingPointLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -74,7 +75,8 @@ public class ASTFloatingPointLiteral extends SimpleNode * @return The data object. * @throws TemplateInitException */ - public Object init( InternalContextAdapter context, Object data) + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { /* @@ -83,13 +85,13 @@ public class ASTFloatingPointLiteral extends SimpleNode super.init( context, data ); - /** + /* * Determine the size of the item and make it a Double or BigDecimal as appropriate. */ String str = getFirstToken().image; try { - value = new Double( str ); + value = Double.valueOf( str ); } catch ( NumberFormatException E1 ) { @@ -106,7 +108,8 @@ public class ASTFloatingPointLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) { return value; } @@ -114,7 +117,8 @@ public class ASTFloatingPointLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) { return !rsvc.getBoolean(RuntimeConstants.CHECK_EMPTY_OBJECTS, true) || !MathUtils.isZero(value); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGENode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGENode.java index fb4112a9..62be6c76 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGENode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGENode.java @@ -42,6 +42,7 @@ public class ASTGENode extends ASTComparisonNode return ">="; } + @Override public boolean numberTest(int compareResult) { return compareResult >= 0; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java index 0065f27a..2eddc6f7 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java @@ -42,6 +42,7 @@ public class ASTGTNode extends ASTComparisonNode return ">"; } + @Override public boolean numberTest(int compareResult) { return compareResult == 1; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java index f57d2d1c..3cb762a4 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java @@ -25,7 +25,6 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.parser.LogContext; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.util.introspection.Info; import org.apache.velocity.util.introspection.IntrospectionCacheData; @@ -92,6 +91,7 @@ public class ASTIdentifier extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -105,6 +105,7 @@ public class ASTIdentifier extends SimpleNode * @return The data object. * @throws TemplateInitException */ + @Override public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { @@ -125,6 +126,7 @@ public class ASTIdentifier extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) */ + @Override public Object execute(Object o, InternalContextAdapter context) throws MethodInvocationException { @@ -141,7 +143,7 @@ public class ASTIdentifier extends SimpleNode */ IntrospectionCacheData icd = context.icacheGet(this); - Class clazz = o instanceof Class ? (Class)o : o.getClass(); + Class<?> clazz = o instanceof Class<?> ? (Class<?>)o : o.getClass(); /* * if we have the cache data and the class of the object we are @@ -150,7 +152,7 @@ public class ASTIdentifier extends SimpleNode * that is fixed in the template :) */ - if ( icd != null && (o != null) && (icd.contextData == clazz) ) + if ( icd != null && (icd.contextData == clazz) ) { vg = (VelPropertyGet) icd.thingy; } @@ -163,7 +165,7 @@ public class ASTIdentifier extends SimpleNode vg = rsvc.getUberspect().getPropertyGet(o, identifier, uberInfo); - if (vg != null && vg.isCacheable() && (o != null)) + if (vg != null && vg.isCacheable()) { icd = new IntrospectionCacheData(); icd.contextData = clazz; @@ -173,7 +175,7 @@ public class ASTIdentifier extends SimpleNode } } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -230,7 +232,7 @@ public class ASTIdentifier extends SimpleNode (Exception) t, uberInfo); } - /** + /* * If the event handler throws an exception, then wrap it * in a MethodInvocationException. */ @@ -264,7 +266,7 @@ public class ASTIdentifier extends SimpleNode { return null; } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java index b2ac0429..b1b1bb66 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java @@ -19,15 +19,6 @@ package org.apache.velocity.runtime.parser.node; * under the License. */ -/** - * Please look at the Parser.jjt file which is - * what controls the generation of this class. - * - * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a> - * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a> - * @version $Id$ -*/ - import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; @@ -43,7 +34,12 @@ import java.io.Writer; /** + * Please look at the Parser.jjt file which is + * what controls the generation of this class. * + * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a> + * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a> + * @version $Id$ */ public class ASTIfStatement extends SimpleNode { @@ -75,6 +71,7 @@ public class ASTIfStatement extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -84,7 +81,8 @@ public class ASTIfStatement extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); @@ -151,7 +149,8 @@ public class ASTIfStatement extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException,MethodInvocationException, ResourceNotFoundException, ParseErrorException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java index c166c1c4..37f88b2b 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java @@ -49,6 +49,7 @@ public class ASTIncludeStatement extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -58,7 +59,8 @@ public class ASTIncludeStatement extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java index c5c529cd..ff8576fe 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.runtime.parser.node; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.runtime.parser.node; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; @@ -84,6 +85,7 @@ public class ASTIndex extends SimpleNode * @return data * @throws TemplateInitException */ + @Override public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { @@ -94,7 +96,7 @@ public class ASTIndex extends SimpleNode } private final static Object[] noParams = {}; - private final static Class[] noTypes = {}; + private final static Class<?>[] noTypes = {}; /** * If argument is an Integer and negative, then return (o.size() - argument). @@ -152,7 +154,7 @@ public class ASTIndex extends SimpleNode null, node.getRuntimeServices().getLogContext().getStackTrace()); } - argument = sizeint + ((Integer) argument).intValue(); + argument = sizeint + (Integer) argument; } // Nothing to do, return the original argument @@ -165,6 +167,7 @@ public class ASTIndex extends SimpleNode * @return object value * @throws MethodInvocationException */ + @Override public Object execute(Object o, InternalContextAdapter context) throws MethodInvocationException { @@ -172,7 +175,7 @@ public class ASTIndex extends SimpleNode // If negative, turn -1 into size - 1 argument = adjMinusIndexArg(argument, o, context, this); Object [] params = {argument}; - Class[] paramClasses = {argument == null ? null : argument.getClass()}; + Class<?>[] paramClasses = {argument == null ? null : argument.getClass()}; VelMethod method = ClassUtils.getMethod(methodName, params, paramClasses, o, context, this, strictRef); @@ -201,7 +204,7 @@ public class ASTIndex extends SimpleNode return obj; } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java index e62950f6..56e2c3ba 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java @@ -58,6 +58,7 @@ public class ASTIntegerLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -66,7 +67,8 @@ public class ASTIntegerLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { /* @@ -75,7 +77,7 @@ public class ASTIntegerLiteral extends SimpleNode super.init( context, data ); - /** + /* * Determine the size of the item and make it an Integer, Long, or BigInteger as appropriate. */ String str = getFirstToken().image; @@ -103,7 +105,8 @@ public class ASTIntegerLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) { return value; } @@ -111,7 +114,8 @@ public class ASTIntegerLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) { return !rsvc.getBoolean(RuntimeConstants.CHECK_EMPTY_OBJECTS, true) || !MathUtils.isZero(value); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java index 117e2a6d..5135ff92 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java @@ -60,6 +60,7 @@ public class ASTIntegerRange extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -208,7 +209,8 @@ public class ASTIntegerRange extends SimpleNode * @return Object array of Integers * @throws MethodInvocationException */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) throws MethodInvocationException { /* @@ -283,7 +285,8 @@ public class ASTIntegerRange extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java index 53a07f99..ff3c2e8e 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java @@ -42,6 +42,7 @@ public class ASTLENode extends ASTComparisonNode return "<="; } + @Override public boolean numberTest(int compareResult) { return compareResult <= 0; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java index c381406e..a4a43465 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java @@ -42,6 +42,7 @@ public class ASTLTNode extends ASTComparisonNode return "<"; } + @Override public boolean numberTest(int compareResult) { return compareResult == -1; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLogicalOperator.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLogicalOperator.java index 1455f545..60180460 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLogicalOperator.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLogicalOperator.java @@ -20,7 +20,8 @@ public abstract class ASTLogicalOperator extends ASTBinaryOperator * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java index f628546c..c259b2fb 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java @@ -58,6 +58,7 @@ public class ASTMap extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -66,6 +67,7 @@ public class ASTMap extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ + @Override public Object value(InternalContextAdapter context) throws MethodInvocationException { @@ -91,7 +93,8 @@ public class ASTMap extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens @@ -101,7 +104,8 @@ public class ASTMap extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) { return !rsvc.getBoolean(RuntimeConstants.CHECK_EMPTY_OBJECTS, true) || children != null && children.length > 0; } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java index 9faa897e..e298bc0f 100755 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java @@ -57,6 +57,7 @@ public abstract class ASTMathNode extends ASTBinaryOperator /** * {@inheritDoc} */ + @Override public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { super.init(context, data); @@ -68,6 +69,7 @@ public abstract class ASTMathNode extends ASTBinaryOperator /** * {@inheritDoc} */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -80,6 +82,7 @@ public abstract class ASTMathNode extends ASTBinaryOperator * @return result or null * @throws MethodInvocationException */ + @Override public Object value(InternalContextAdapter context) throws MethodInvocationException { Object left = jjtGetChild(0).value(context); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java index 4d9b123d..5696b6bb 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java @@ -27,7 +27,6 @@ import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.directive.StopCommand; -import org.apache.velocity.runtime.parser.LogContext; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.introspection.Info; @@ -90,6 +89,7 @@ public class ASTMethod extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -103,7 +103,8 @@ public class ASTMethod extends SimpleNode * @return The init result * @throws TemplateInitException */ - public Object init( InternalContextAdapter context, Object data) + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { super.init( context, data ); @@ -138,6 +139,7 @@ public class ASTMethod extends SimpleNode * @return Result or null. * @throws MethodInvocationException */ + @Override public Object execute(Object o, InternalContextAdapter context) throws MethodInvocationException { @@ -233,13 +235,13 @@ public class ASTMethod extends SimpleNode return handleInvocationException(o, context, ite.getTargetException()); } - /** Can also be thrown by method invocation **/ + /* Can also be thrown by method invocation */ catch( IllegalArgumentException t ) { return handleInvocationException(o, context, t); } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -291,7 +293,7 @@ public class ASTMethod extends SimpleNode return EventHandlerUtil.methodException( rsvc, context, o.getClass(), methodName, (Exception) t, uberInfo ); } - /** + /* * If the event handler throws an exception, then wrap it * in a MethodInvocationException. Don't pass through RuntimeExceptions like other * similar catchall code blocks. @@ -355,7 +357,7 @@ public class ASTMethod extends SimpleNode public MethodCacheKey(String methodName, Class<?>[] params, boolean classObject) { - /** + /* * Should never be initialized with nulls, but to be safe we refuse * to accept them. */ @@ -369,7 +371,7 @@ public class ASTMethod extends SimpleNode */ public boolean equals(Object o) { - /** + /* * note we skip the null test for methodName and params * due to the earlier test in the constructor */ @@ -408,7 +410,7 @@ public class ASTMethod extends SimpleNode { int result = 17; - /** + /* * note we skip the null test for methodName and params * due to the earlier test in the constructor */ diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java index 5978faf8..d9de7911 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java @@ -54,6 +54,7 @@ public class ASTModNode extends ASTMathNode super(p, id); } + @Override public Number perform(Number left, Number right, InternalContextAdapter context) { /* @@ -81,7 +82,8 @@ public class ASTModNode extends ASTMathNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java index 5ded7b30..67bad83e 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java @@ -54,6 +54,7 @@ public class ASTMulNode extends ASTMathNode super(p, id); } + @Override public Number perform(Number left, Number right, InternalContextAdapter context) { return MathUtils.multiply(left, right); @@ -63,7 +64,8 @@ public class ASTMulNode extends ASTMathNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java index 92303041..842a2925 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java @@ -25,6 +25,7 @@ public class ASTNegateNode extends SimpleNode /** * {@inheritDoc} */ + @Override public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { super.init(context, data); @@ -37,6 +38,7 @@ public class ASTNegateNode extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -45,7 +47,8 @@ public class ASTNegateNode extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { return jjtGetChild(0).evaluate(context); @@ -54,7 +57,8 @@ public class ASTNegateNode extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) throws MethodInvocationException { Object value = jjtGetChild(0).value( context ); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java index f65736e0..310a3536 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java @@ -50,6 +50,7 @@ public class ASTNotNode extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -58,7 +59,8 @@ public class ASTNotNode extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { return !jjtGetChild(0).evaluate(context); @@ -67,7 +69,8 @@ public class ASTNotNode extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) throws MethodInvocationException { return (jjtGetChild(0).evaluate( context ) ? Boolean.FALSE : Boolean.TRUE) ; @@ -77,7 +80,8 @@ public class ASTNotNode extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java index db4a7e53..16d1b236 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java @@ -54,6 +54,7 @@ public class ASTObjectArray extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -62,7 +63,8 @@ public class ASTObjectArray extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) throws MethodInvocationException { int size = jjtGetNumChildren(); @@ -82,7 +84,8 @@ public class ASTObjectArray extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens @@ -92,7 +95,8 @@ public class ASTObjectArray extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) { return !rsvc.getBoolean(RuntimeConstants.CHECK_EMPTY_OBJECTS, true) || children != null && children.length > 0; } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java index f87d3b6c..c019e452 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java @@ -59,6 +59,7 @@ public class ASTOrNode extends ASTLogicalOperator /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -72,6 +73,7 @@ public class ASTOrNode extends ASTLogicalOperator * @return The Expression value. * @throws MethodInvocationException */ + @Override public Object value(InternalContextAdapter context ) throws MethodInvocationException { @@ -90,7 +92,8 @@ public class ASTOrNode extends ASTLogicalOperator * @return The evaluation result. * @throws MethodInvocationException */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { Node left = jjtGetChild(0); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java index 3b73ad8c..1c004286 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java @@ -47,6 +47,7 @@ public class ASTParameters extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java index 747780dd..3d37c43e 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java @@ -142,6 +142,7 @@ public class ASTReference extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -150,6 +151,7 @@ public class ASTReference extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ + @Override public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { @@ -229,7 +231,7 @@ public class ASTReference extends SimpleNode rsvc.getBoolean(RuntimeConstants.EVENTHANDLER_INVALIDREFERENCES_TESTED, false); - /** + /* * In the case we are referencing a variable with #if($foo) or * #if( ! $foo) then we allow variables to be undefined and we * set strictRef to false so that if the variable is undefined @@ -280,6 +282,7 @@ public class ASTReference extends SimpleNode * @return The execution result. * @throws MethodInvocationException */ + @Override public Object execute(Object o, InternalContextAdapter context) throws MethodInvocationException { @@ -309,7 +312,7 @@ public class ASTReference extends SimpleNode * is *knowingly* potentially null and should be accepted * in strict mode (except if the alternate value is null) */ - if (astAlternateValue != null && (result == null || !DuckType.asBoolean(result, false))) + if (astAlternateValue != null && (!DuckType.asBoolean(result, false))) { result = astAlternateValue.value(context); } @@ -354,7 +357,7 @@ public class ASTReference extends SimpleNode { if (strictRef && result == null) { - /** + /* * At this point we know that an attempt is about to be made * to call a method or property on a null value. */ @@ -367,7 +370,7 @@ public class ASTReference extends SimpleNode } previousResult = result; result = jjtGetChild(i).execute(result,context); - if (astAlternateValue != null && (result == null || !DuckType.asBoolean(result, checkEmpty))) + if (astAlternateValue != null && (!DuckType.asBoolean(result, checkEmpty))) { result = astAlternateValue.value(context); } @@ -461,6 +464,7 @@ public class ASTReference extends SimpleNode * @throws IOException * @throws MethodInvocationException */ + @Override public boolean render(InternalContextAdapter context, Writer writer) throws IOException, MethodInvocationException { @@ -477,7 +481,7 @@ public class ASTReference extends SimpleNode Object value = null; if (escaped && strictEscape) { - /** + /* * If we are in strict mode and the variable is escaped, then don't bother to * retrieve the value since we won't use it. And if the var is not defined * it will throw an exception. Set value to TRUE to fall through below with @@ -606,7 +610,6 @@ public class ASTReference extends SimpleNode log.debug("Null reference [template '{}', line {}, column {}]: {} cannot be resolved.", getTemplateName(), this.getLine(), this.getColumn(), this.literal()); } - return true; } else { @@ -624,8 +627,8 @@ public class ASTReference extends SimpleNode writer.write(toString); } - return true; } + return true; } finally { @@ -668,6 +671,7 @@ public class ASTReference extends SimpleNode * @return True if evaluation was ok. * @throws MethodInvocationException */ + @Override public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { @@ -695,6 +699,7 @@ public class ASTReference extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ + @Override public Object value(InternalContextAdapter context) throws MethodInvocationException { @@ -707,7 +712,7 @@ public class ASTReference extends SimpleNode * @param clazz * @return class name, or the string "null" */ - public static String printClass(Class clazz) + public static String printClass(Class<?> clazz) { return clazz == null ? "null" : clazz.getName(); } @@ -795,7 +800,7 @@ public class ASTReference extends SimpleNode // If negative, turn -1 into (size - 1) argument = ASTIndex.adjMinusIndexArg(argument, result, context, astIndex); Object [] params = {argument, value}; - Class[] paramClasses = {params[0] == null ? null : params[0].getClass(), + Class<?>[] paramClasses = {params[0] == null ? null : params[0].getClass(), params[1] == null ? null : params[1].getClass()}; String methodName = "set"; @@ -894,7 +899,7 @@ public class ASTReference extends SimpleNode + ite.getTargetException().toString(), ite.getTargetException(), rsvc.getLogContext().getStackTrace(), identifier, getTemplateName(), this.getLine(), this.getColumn()); } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java index 91259dd4..0cf4d566 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java @@ -25,7 +25,6 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeConstants.SpaceGobbling; -import org.apache.velocity.runtime.parser.LogContext; import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.util.introspection.Info; @@ -85,6 +84,7 @@ public class ASTSetDirective extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -97,10 +97,11 @@ public class ASTSetDirective extends SimpleNode * @return Init result. * @throws TemplateInitException */ + @Override public synchronized Object init(InternalContextAdapter context, Object data) throws TemplateInitException { - /** This method is synchronized to prevent double initialization or initialization while rendering **/ + /* This method is synchronized to prevent double initialization or initialization while rendering */ if (!isInitialized) { @@ -212,7 +213,8 @@ public class ASTSetDirective extends SimpleNode * @throws IOException * @throws MethodInvocationException */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException, MethodInvocationException { try diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java index ff7a98c9..44134727 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java @@ -74,6 +74,7 @@ public class ASTStringLiteral extends SimpleNode * @return Init result. * @throws TemplateInitException */ + @Override public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { @@ -280,6 +281,7 @@ public class ASTStringLiteral extends SimpleNode * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, * java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -303,6 +305,7 @@ public class ASTStringLiteral extends SimpleNode * @param context * @return result of the rendering. */ + @Override public Object value(InternalContextAdapter context) { if (interpolate) @@ -323,7 +326,7 @@ public class ASTStringLiteral extends SimpleNode return writer.toString(); } - /** + /* * pass through application level runtime exceptions */ catch (RuntimeException e) @@ -351,7 +354,8 @@ public class ASTStringLiteral extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) { String str = (String)value(context); return str != null && (!rsvc.getBoolean(RuntimeConstants.CHECK_EMPTY_OBJECTS, true) || !str.isEmpty()); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java index 42906614..25642c13 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java @@ -59,6 +59,7 @@ public class ASTSubtractNode extends ASTMathNode return "-"; } + @Override public Number perform(Number left, Number right, InternalContextAdapter context) { return MathUtils.subtract(left, right); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java index 526a1e12..0f4be56f 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java @@ -73,6 +73,7 @@ public class ASTText extends SimpleNode * text getter * @return literal representation */ + @Override public String literal() { return ctext; @@ -81,6 +82,7 @@ public class ASTText extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -89,7 +91,8 @@ public class ASTText extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { StringBuilder builder = new StringBuilder(); @@ -109,7 +112,8 @@ public class ASTText extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException { writer.write(ctext); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java index 68da9430..d133b292 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java @@ -53,6 +53,7 @@ public class ASTTextblock extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -61,7 +62,8 @@ public class ASTTextblock extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Token t = getFirstToken(); @@ -82,7 +84,8 @@ public class ASTTextblock extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException { writer.write(ctext); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java index 530861f9..7763ed60 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java @@ -50,6 +50,7 @@ public class ASTTrue extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -58,6 +59,7 @@ public class ASTTrue extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#evaluate(org.apache.velocity.context.InternalContextAdapter) */ + @Override public boolean evaluate(InternalContextAdapter context) { return true; @@ -66,6 +68,7 @@ public class ASTTrue extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#value(org.apache.velocity.context.InternalContextAdapter) */ + @Override public Object value(InternalContextAdapter context) { return value; @@ -75,7 +78,8 @@ public class ASTTrue extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java index be89bae3..6b104667 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java @@ -49,6 +49,7 @@ public class ASTVariable extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -58,7 +59,8 @@ public class ASTVariable extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java index 14cbdc9b..9493babf 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java @@ -48,6 +48,7 @@ public class ASTWord extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -57,7 +58,8 @@ public class ASTWord extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); saveTokenImages(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java index f34ec8dc..e9c67039 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java @@ -48,6 +48,7 @@ public class ASTprocess extends SimpleNode /** * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -57,7 +58,8 @@ public class ASTprocess extends SimpleNode * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { Object obj = super.init(context, data); cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java index 179d03cc..1c834f8c 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java @@ -46,7 +46,7 @@ public class BooleanPropertyExecutor extends PropertyExecutor * @since 1.5 */ public BooleanPropertyExecutor(final Logger log, final Introspector introspector, - final Class clazz, final String property) + final Class<?> clazz, final String property) { this(log, introspector, clazz, property, false); } @@ -60,12 +60,13 @@ public class BooleanPropertyExecutor extends PropertyExecutor * @since 1.5 */ public BooleanPropertyExecutor(final Logger log, final Introspector introspector, - final Class clazz, final String property, final boolean wrapArray) + final Class<?> clazz, final String property, final boolean wrapArray) { super(log, introspector, clazz, property, wrapArray); } - protected void discover(final Class clazz, final String property) + @Override + protected void discover(final Class<?> clazz, final String property) { try { @@ -105,7 +106,7 @@ public class BooleanPropertyExecutor extends PropertyExecutor } } } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java index 7ffc08f7..e08d2c69 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java @@ -51,7 +51,7 @@ public class GetExecutor extends AbstractExecutor * @since 1.5 */ public GetExecutor(final Logger log, final Introspector introspector, - final Class clazz, final String property) + final Class<?> clazz, final String property) { this.log = log; this.introspector = introspector; @@ -91,7 +91,7 @@ public class GetExecutor extends AbstractExecutor } } } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -111,6 +111,7 @@ public class GetExecutor extends AbstractExecutor * @return value * @see org.apache.velocity.runtime.parser.node.AbstractExecutor#execute(java.lang.Object) */ + @Override public Object execute(final Object o) throws IllegalAccessException, InvocationTargetException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java index 3ce0d097..2c9aaea5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java @@ -73,6 +73,7 @@ public class MapGetExecutor return false; } + @Override public Object execute(final Object o) { return ((Map) o).get(property); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java index cd597010..3dd3301a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java @@ -58,7 +58,7 @@ public class MapSetExecutor setMethod(Map.class.getMethod("put", Object.class, Object.class)); } } - /** + /* * pass through application level runtime exceptions */ catch (RuntimeException e) @@ -76,6 +76,7 @@ public class MapSetExecutor } } + @Override public Object execute(final Object o, final Object arg) { return ((Map) o).put(property, arg); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java index b88f5bb6..52cedccb 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java @@ -80,7 +80,7 @@ public abstract class MathUtils /** * The "size" of the number-types - ascending. */ - private static final List<Class<? extends Number>> typesBySize = new ArrayList(); + private static final List<Class<? extends Number>> typesBySize = new ArrayList<>(); static { typesBySize.add (Byte.class); @@ -109,7 +109,7 @@ public abstract class MathUtils return new BigDecimal ( (BigInteger)n ); } - return new BigDecimal (n.doubleValue()); + return BigDecimal.valueOf(n.doubleValue()); } @@ -174,7 +174,7 @@ public abstract class MathUtils * @param type * @return Number object representing the primitive. */ - public static Number wrapPrimitive (long value, Class type) + public static Number wrapPrimitive (long value, Class<?> type) { if (type == Byte.class) { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java index cb44c6d2..ff867a15 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java @@ -156,6 +156,7 @@ public interface Node extends Renderable * @throws ParseErrorException * @throws ResourceNotFoundException */ + @Override boolean render(InternalContextAdapter context, Writer writer) throws IOException,MethodInvocationException, ParseErrorException, ResourceNotFoundException; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java index a5d80ae3..8fe14fe6 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java @@ -329,10 +329,4 @@ public interface ParserVisitor * @return The object rendered by this node. */ Object visit(ASTNotNode node, Object data); - - /** - * @param node - * @param data - * @return The object rendered by this node. - */ } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java index cabcb506..7763724c 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java @@ -57,7 +57,7 @@ public class PropertyExecutor extends AbstractExecutor * @since 1.5 */ public PropertyExecutor(final Logger log, final Introspector introspector, - final Class clazz, final String property, final boolean wrapArray) + final Class<?> clazz, final String property, final boolean wrapArray) { this.log = log; this.introspector = introspector; @@ -120,7 +120,7 @@ public class PropertyExecutor extends AbstractExecutor setMethod(introspector.getMethod(clazz, sb.toString(), params)); } } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -138,6 +138,7 @@ public class PropertyExecutor extends AbstractExecutor /** * @see org.apache.velocity.runtime.parser.node.AbstractExecutor#execute(java.lang.Object) */ + @Override public Object execute(Object o) throws IllegalAccessException, InvocationTargetException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java index 1935dd38..643f9817 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java @@ -47,7 +47,7 @@ public class PublicFieldExecutor extends AbstractExecutor * @since 1.5 */ public PublicFieldExecutor(final Logger log, final Introspector introspector, - final Class clazz, final String property) + final Class<?> clazz, final String property) { this.log = log; this.introspector = introspector; @@ -61,6 +61,7 @@ public class PublicFieldExecutor extends AbstractExecutor } } + @Override public boolean isAlive() { return getField() != null; } @@ -94,13 +95,13 @@ public class PublicFieldExecutor extends AbstractExecutor * @param clazz * @param property */ - protected void discover(final Class clazz, final String property) + protected void discover(final Class<?> clazz, final String property) { try { setField(introspector.getField(clazz, property)); } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -118,6 +119,7 @@ public class PublicFieldExecutor extends AbstractExecutor /** * @see org.apache.velocity.runtime.parser.node.AbstractExecutor#execute(java.lang.Object) */ + @Override public Object execute(Object o) throws IllegalAccessException, InvocationTargetException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java index 5bacd8d3..09072615 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java @@ -51,7 +51,7 @@ public class PutExecutor extends SetExecutor * @param property */ public PutExecutor(final Logger log, final Introspector introspector, - final Class clazz, final Object arg, final String property) + final Class<?> clazz, final Object arg, final String property) { this.log = log; this.introspector = introspector; @@ -64,7 +64,7 @@ public class PutExecutor extends SetExecutor * @param clazz * @param arg */ - protected void discover(final Class clazz, final Object arg) + protected void discover(final Class<?> clazz, final Object arg) { Object [] params; @@ -89,7 +89,7 @@ public class PutExecutor extends SetExecutor { setMethod(introspector.getMethod(clazz, "put", params)); } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -107,6 +107,7 @@ public class PutExecutor extends SetExecutor /** * @see org.apache.velocity.runtime.parser.node.SetExecutor#execute(java.lang.Object, java.lang.Object) */ + @Override public Object execute(final Object o, final Object value) throws IllegalAccessException, InvocationTargetException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java index 2ebcb638..e02ca4e6 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java @@ -47,7 +47,7 @@ public class SetPropertyExecutor * @param arg */ public SetPropertyExecutor(final Logger log, final Introspector introspector, - final Class clazz, final String property, final Object arg) + final Class<?> clazz, final String property, final Object arg) { this.log = log; this.introspector = introspector; @@ -74,7 +74,7 @@ public class SetPropertyExecutor * @param property * @param arg */ - protected void discover(final Class clazz, final String property, final Object arg) + protected void discover(final Class<?> clazz, final String property, final Object arg) { Object [] params = new Object [] { arg }; @@ -105,7 +105,7 @@ public class SetPropertyExecutor setMethod(introspector.getMethod(clazz, sb.toString(), params)); } } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -128,6 +128,7 @@ public class SetPropertyExecutor * @throws IllegalAccessException * @throws InvocationTargetException */ + @Override public Object execute(final Object o, final Object value) throws IllegalAccessException, InvocationTargetException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java index 117a8412..7dead361 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.java @@ -52,7 +52,7 @@ public class SetPublicFieldExecutor * @param arg */ public SetPublicFieldExecutor(final Logger log, final Introspector introspector, - final Class clazz, final String property, final Object arg) + final Class<?> clazz, final String property, final Object arg) { this.log = log; this.introspector = introspector; @@ -66,6 +66,7 @@ public class SetPublicFieldExecutor } } + @Override public boolean isAlive() { return getField() != null; } @@ -99,7 +100,7 @@ public class SetPublicFieldExecutor * @param property * @param arg */ - protected void discover(final Class clazz, final String property, final Object arg) + protected void discover(final Class<?> clazz, final String property, final Object arg) { try { @@ -109,7 +110,7 @@ public class SetPublicFieldExecutor setField(field); } } - /** + /* * pass through application level runtime exceptions */ catch( RuntimeException e ) @@ -132,6 +133,7 @@ public class SetPublicFieldExecutor * @throws IllegalAccessException * @throws InvocationTargetException */ + @Override public Object execute(final Object o, final Object value) throws IllegalAccessException, InvocationTargetException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java index 1c6761bb..ac9f7da8 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java @@ -134,6 +134,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtOpen() */ + @Override public void jjtOpen() { first = parser.getToken(1); // added @@ -142,6 +143,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtClose() */ + @Override public void jjtClose() { last = parser.getToken(0); // added @@ -158,6 +160,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#getFirstToken() */ + @Override public Token getFirstToken() { return first; @@ -166,6 +169,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#getLastToken() */ + @Override public Token getLastToken() { return last; @@ -174,6 +178,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtSetParent(org.apache.velocity.runtime.parser.node.Node) */ + @Override public void jjtSetParent(Node n) { parent = n; @@ -182,6 +187,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtGetParent() */ + @Override public Node jjtGetParent() { return parent; @@ -190,6 +196,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtAddChild(org.apache.velocity.runtime.parser.node.Node, int) */ + @Override public void jjtAddChild(Node n, int i) { if (children == null) @@ -208,6 +215,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtGetChild(int) */ + @Override public Node jjtGetChild(int i) { return children[i]; @@ -216,6 +224,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtGetNumChildren() */ + @Override public int jjtGetNumChildren() { return (children == null) ? 0 : children.length; @@ -225,6 +234,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object jjtAccept(ParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -234,6 +244,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#childrenAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) */ + @Override public Object childrenAccept(ParserVisitor visitor, Object data) { if (children != null) @@ -341,6 +352,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#literal() */ + @Override public String literal() { if( literal != null ) @@ -371,7 +383,8 @@ public class SimpleNode implements Node * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) */ - public Object init( InternalContextAdapter context, Object data) throws TemplateInitException + @Override + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { /* * hold onto the RuntimeServices @@ -396,7 +409,8 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#evaluate(org.apache.velocity.context.InternalContextAdapter) */ - public boolean evaluate( InternalContextAdapter context) + @Override + public boolean evaluate(InternalContextAdapter context) throws MethodInvocationException { return false; @@ -405,7 +419,8 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#value(org.apache.velocity.context.InternalContextAdapter) */ - public Object value( InternalContextAdapter context) + @Override + public Object value(InternalContextAdapter context) throws MethodInvocationException { return null; @@ -414,7 +429,8 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#render(org.apache.velocity.context.InternalContextAdapter, java.io.Writer) */ - public boolean render( InternalContextAdapter context, Writer writer) + @Override + public boolean render(InternalContextAdapter context, Writer writer) throws IOException, MethodInvocationException, ParseErrorException, ResourceNotFoundException { int i, k = jjtGetNumChildren(); @@ -428,6 +444,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) */ + @Override public Object execute(Object o, InternalContextAdapter context) throws MethodInvocationException { @@ -437,6 +454,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#getType() */ + @Override public int getType() { return id; @@ -445,6 +463,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#setInfo(int) */ + @Override public void setInfo(int info) { this.info = info; @@ -453,6 +472,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#getInfo() */ + @Override public int getInfo() { return info; @@ -461,6 +481,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#setInvalid() */ + @Override public void setInvalid() { invalid = true; @@ -469,6 +490,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#isInvalid() */ + @Override public boolean isInvalid() { return invalid; @@ -477,6 +499,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#getLine() */ + @Override public int getLine() { return line; @@ -485,6 +508,7 @@ public class SimpleNode implements Node /** * @see org.apache.velocity.runtime.parser.node.Node#getColumn() */ + @Override public int getColumn() { return column; @@ -520,6 +544,7 @@ public class SimpleNode implements Node + ", tokens=" + tok + "]"; } + @Override public String getTemplateName() { return template.getName(); @@ -556,6 +581,7 @@ public class SimpleNode implements Node /** * @return String image variable of the first Token element that was parsed and connected to this Node. */ + @Override public String getFirstTokenImage() { return firstImage; @@ -564,17 +590,20 @@ public class SimpleNode implements Node /** * @return String image variable of the last Token element that was parsed and connected to this Node. */ + @Override public String getLastTokenImage() { return lastImage; } + @Override public Template getTemplate() { return template; } /** * @return the parser which created this node * @since 2.2 */ + @Override public Parser getParser() { return parser; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java index adccb7f0..67974d1e 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java @@ -54,6 +54,7 @@ public class ContentResource extends Resource * @exception ResourceNotFoundException Resource could not be * found. */ + @Override public boolean process() throws ResourceNotFoundException { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java index 9849eb94..7ad03518 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java @@ -101,7 +101,8 @@ public class ResourceCacheImpl implements ResourceCache /** * @see org.apache.velocity.runtime.resource.ResourceCache#initialize(org.apache.velocity.runtime.RuntimeServices) */ - public void initialize( RuntimeServices rs ) + @Override + public void initialize(RuntimeServices rs ) { rsvc = rs; @@ -111,7 +112,7 @@ public class ResourceCacheImpl implements ResourceCache { // Create a whole new Map here to avoid hanging on to a // handle to the unsynch'd LRUMap for our lifetime. - Map<Object, Resource> lruCache = Collections.synchronizedMap(new LRUMap<Object, Resource>(maxSize)); + Map<Object, Resource> lruCache = Collections.synchronizedMap(new LRUMap<>(maxSize)); lruCache.putAll(cache); cache = lruCache; } @@ -121,7 +122,8 @@ public class ResourceCacheImpl implements ResourceCache /** * @see org.apache.velocity.runtime.resource.ResourceCache#get(java.lang.Object) */ - public Resource get( Object key ) + @Override + public Resource get(Object key ) { return cache.get( key ); } @@ -129,7 +131,8 @@ public class ResourceCacheImpl implements ResourceCache /** * @see org.apache.velocity.runtime.resource.ResourceCache#put(java.lang.Object, org.apache.velocity.runtime.resource.Resource) */ - public Resource put( Object key, Resource value ) + @Override + public Resource put(Object key, Resource value ) { return cache.put( key, value ); } @@ -137,7 +140,8 @@ public class ResourceCacheImpl implements ResourceCache /** * @see org.apache.velocity.runtime.resource.ResourceCache#remove(java.lang.Object) */ - public Resource remove( Object key ) + @Override + public Resource remove(Object key ) { return cache.remove( key ); } @@ -146,6 +150,7 @@ public class ResourceCacheImpl implements ResourceCache * @see org.apache.velocity.runtime.resource.ResourceCache#clear() * @since 2.0 */ + @Override public void clear() { cache.clear(); @@ -154,6 +159,7 @@ public class ResourceCacheImpl implements ResourceCache /** * @see org.apache.velocity.runtime.resource.ResourceCache#enumerateKeys() */ + @Override public Iterator<Object> enumerateKeys() { return cache.keySet().iterator(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java index 472286bc..4acc602d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java @@ -92,6 +92,7 @@ public class ResourceManagerImpl * * @param rs The Runtime Services object which is associated with this Resource Manager. */ + @Override public synchronized void initialize(final RuntimeServices rs) { if (isInit) @@ -111,7 +112,7 @@ public class ResourceManagerImpl for (ExtProperties configuration : sourceInitializerList) { - /** + /* * Resource loader can be loaded either via class name or be passed * in as an instance. */ @@ -199,6 +200,8 @@ public class ResourceManagerImpl globalCache.initialize(rsvc); + isInit = true; + log.trace("Default ResourceManager initialization complete."); } @@ -208,7 +211,7 @@ public class ResourceManagerImpl */ private void assembleResourceLoaderInitializers() { - Vector resourceLoaderNames = rsvc.getConfiguration().getVector(RuntimeConstants.RESOURCE_LOADERS); + Vector<String> resourceLoaderNames = rsvc.getConfiguration().getVector(RuntimeConstants.RESOURCE_LOADERS); for (ListIterator<String> it = resourceLoaderNames.listIterator(); it.hasNext(); ) { @@ -271,6 +274,7 @@ public class ResourceManagerImpl * @throws ResourceNotFoundException if template not found from any available source. * @throws ParseErrorException if template cannot be parsed due to syntax (or other) error. */ + @Override public Resource getResource(final String resourceName, final int resourceType, final String encoding) throws ResourceNotFoundException, ParseErrorException @@ -572,6 +576,7 @@ public class ResourceManagerImpl * * @return class name of loader than can provide it */ + @Override public String getLoaderNameForResource(String resourceName) { ResourceLoader loader = getLoaderForResource(resourceName); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java index 7ba64a38..9bfd0f14 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java @@ -83,7 +83,8 @@ public class ClasspathResourceLoader extends ResourceLoader * This is abstract in the base class, so we need it * @param configuration */ - public void init( ExtProperties configuration) + @Override + public void init(ExtProperties configuration) { log.trace("ClasspathResourceLoader: initialization complete."); } @@ -99,7 +100,8 @@ public class ClasspathResourceLoader extends ResourceLoader * in classpath. * @since 2.0 */ - public Reader getResourceReader( String name, String encoding ) + @Override + public Reader getResourceReader(String name, String encoding ) throws ResourceNotFoundException { Reader result = null; @@ -109,7 +111,7 @@ public class ClasspathResourceLoader extends ResourceLoader throw new ResourceNotFoundException ("No template name provided"); } - /** + /* * look for resource in thread classloader first (e.g. WEB-INF\lib in * a servlet container) then fall back to the system classloader. */ @@ -149,6 +151,7 @@ public class ClasspathResourceLoader extends ResourceLoader /** * @see ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public boolean isSourceModified(Resource resource) { return false; @@ -157,6 +160,7 @@ public class ClasspathResourceLoader extends ResourceLoader /** * @see ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public long getLastModified(Resource resource) { return 0; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java index 5ef6d446..b9cc48cc 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java @@ -21,7 +21,6 @@ package org.apache.velocity.runtime.resource.loader; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.util.ExtProperties; @@ -32,7 +31,6 @@ import javax.naming.NamingException; import javax.sql.DataSource; import java.io.FilterReader; import java.io.IOException; -import java.io.InputStream; import java.io.Reader; import java.sql.Connection; import java.sql.PreparedStatement; @@ -182,6 +180,7 @@ public class DataSourceResourceLoader extends ResourceLoader /** * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties) */ + @Override public void init(ExtProperties configuration) { dataSourceName = StringUtils.trim(configuration.getString("datasource_url")); @@ -225,6 +224,7 @@ public class DataSourceResourceLoader extends ResourceLoader /** * @see ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public boolean isSourceModified(final Resource resource) { return (resource.getLastModified() != @@ -234,6 +234,7 @@ public class DataSourceResourceLoader extends ResourceLoader /** * @see ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public long getLastModified(final Resource resource) { return readLastModified(resource, "getting timestamp"); @@ -249,6 +250,7 @@ public class DataSourceResourceLoader extends ResourceLoader * @throws ResourceNotFoundException * @since 2.0 */ + @Override public synchronized Reader getResourceReader(final String name, String encoding) throws ResourceNotFoundException { @@ -394,6 +396,7 @@ public class DataSourceResourceLoader extends ResourceLoader * * @throws Throwable */ + @Override protected void finalize() throws Throwable { @@ -473,7 +476,7 @@ public class DataSourceResourceLoader extends ResourceLoader { try { -// rs.close(); + rs.close(); } catch (RuntimeException re) { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java index b970d086..ba9e5f98 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java @@ -64,12 +64,13 @@ public class FileResourceLoader extends ResourceLoader * times of the files. This is synchronizedMap * instance. */ - private Map<String, String> templatePaths = Collections.synchronizedMap(new HashMap()); + private Map<String, String> templatePaths = Collections.synchronizedMap(new HashMap<>()); /** * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties) */ - public void init( ExtProperties configuration) + @Override + public void init(ExtProperties configuration) { log.trace("FileResourceLoader: initialization starting."); @@ -95,6 +96,7 @@ public class FileResourceLoader extends ResourceLoader * in the file template path. * @since 2.0 */ + @Override public Reader getResourceReader(String templateName, String encoding) throws ResourceNotFoundException { @@ -169,6 +171,7 @@ public class FileResourceLoader extends ResourceLoader * Overrides superclass for better performance. * @since 1.6 */ + @Override public boolean resourceExists(String name) { if (name == null) @@ -268,6 +271,7 @@ public class FileResourceLoader extends ResourceLoader * @param resource * @return True if the source has been modified. */ + @Override public boolean isSourceModified(Resource resource) { /* @@ -322,6 +326,7 @@ public class FileResourceLoader extends ResourceLoader /** * @see ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public long getLastModified(Resource resource) { String path = templatePaths.get(resource.getName()); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java index 3dde84ad..3ccdc944 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java @@ -31,7 +31,6 @@ import java.net.JarURLConnection; import java.net.URL; import java.util.Enumeration; import java.util.HashMap; -import java.util.Hashtable; import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java index 49f4bdd3..23db3743 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java @@ -32,7 +32,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.util.HashMap; -import java.util.Hashtable; import java.util.List; import java.util.ListIterator; import java.util.Map; @@ -87,11 +86,12 @@ public class JarResourceLoader extends ResourceLoader * Called by Velocity to initialize the loader * @param configuration */ - public void init( ExtProperties configuration) + @Override + public void init(ExtProperties configuration) { log.trace("JarResourceLoader: initialization starting."); - List paths = configuration.getList(RuntimeConstants.RESOURCE_LOADER_PATHS); + List<String> paths = configuration.getList(RuntimeConstants.RESOURCE_LOADER_PATHS); if (paths != null) { @@ -175,7 +175,8 @@ public class JarResourceLoader extends ResourceLoader * in the file template path. * @since 2.0 */ - public Reader getResourceReader( String source, String encoding ) + @Override + public Reader getResourceReader(String source, String encoding ) throws ResourceNotFoundException { Reader result = null; @@ -245,6 +246,7 @@ public class JarResourceLoader extends ResourceLoader /** * @see ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public boolean isSourceModified(Resource resource) { return true; @@ -253,6 +255,7 @@ public class JarResourceLoader extends ResourceLoader /** * @see ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public long getLastModified(Resource resource) { return 0; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java index 8cfa4fde..fd5d8c4a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java @@ -152,8 +152,8 @@ public class StringResourceLoader extends ResourceLoader /** Key to look up the repository char encoding. */ public static final String REPOSITORY_ENCODING = "repository.encoding"; - protected static final Map STATIC_REPOSITORIES = - Collections.synchronizedMap(new HashMap()); + protected static final Map<String, StringResourceRepository> STATIC_REPOSITORIES = + Collections.synchronizedMap(new HashMap<>()); /** * Returns a reference to the default static repository. @@ -220,6 +220,7 @@ public class StringResourceLoader extends ResourceLoader * @param configuration * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties) */ + @Override public void init(final ExtProperties configuration) { log.trace("StringResourceLoader: initialization starting."); @@ -335,6 +336,7 @@ public class StringResourceLoader extends ResourceLoader * @return whether resource exists * @since 1.6 */ + @Override public boolean resourceExists(final String name) { if (name == null) @@ -355,6 +357,7 @@ public class StringResourceLoader extends ResourceLoader * in the RepositoryFactory. * @since 2.0 */ + @Override public Reader getResourceReader(String name, String encoding) throws ResourceNotFoundException { @@ -398,6 +401,7 @@ public class StringResourceLoader extends ResourceLoader * @return whether resource was modified * @see ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public boolean isSourceModified(final Resource resource) { StringResource original = null; @@ -418,6 +422,7 @@ public class StringResourceLoader extends ResourceLoader * @return last modified timestamp * @see ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource) */ + @Override public long getLastModified(final Resource resource) { StringResource original = null; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java index 4d5435fc..81fe33b9 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java @@ -21,17 +21,16 @@ package org.apache.velocity.runtime.resource.loader; import org.apache.commons.lang3.StringUtils; import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.util.ExtProperties; import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import java.lang.reflect.Method; import java.net.URL; import java.net.URLConnection; import java.util.HashMap; +import java.util.Map; /** * This is a simple URL-based loader. @@ -44,13 +43,14 @@ import java.util.HashMap; public class URLResourceLoader extends ResourceLoader { private String[] roots = null; - protected HashMap templateRoots = null; + protected Map<String, String> templateRoots = null; private int timeout = -1; /** * @param configuration * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties) */ + @Override public void init(ExtProperties configuration) { log.trace("URLResourceLoader: initialization starting."); @@ -67,7 +67,7 @@ public class URLResourceLoader extends ResourceLoader timeout = configuration.getInt("timeout", -1); // init the template paths map - templateRoots = new HashMap(); + templateRoots = new HashMap<>(); log.trace("URLResourceLoader: initialization complete."); } @@ -83,6 +83,7 @@ public class URLResourceLoader extends ResourceLoader * in the file template path. * @since 2.0 */ + @Override public synchronized Reader getResourceReader(String name, String encoding) throws ResourceNotFoundException { @@ -161,6 +162,7 @@ public class URLResourceLoader extends ResourceLoader * @param resource Resource The resource to check for modification * @return boolean True if the resource has been modified, moved, or unreachable */ + @Override public boolean isSourceModified(Resource resource) { long fileLastModified = getLastModified(resource); @@ -175,11 +177,12 @@ public class URLResourceLoader extends ResourceLoader * @param resource Resource the resource to check * @return long The time when the resource was last modified or 0 if the file can't be reached */ + @Override public long getLastModified(Resource resource) { // get the previously used root String name = resource.getName(); - String root = (String)templateRoots.get(name); + String root = templateRoots.get(name); try { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java index 107a3528..fc93602d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java @@ -20,6 +20,7 @@ package org.apache.velocity.runtime.resource.util; */ import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.resource.Resource; import java.util.Collections; import java.util.HashMap; @@ -39,7 +40,7 @@ public class StringResourceRepositoryImpl implements StringResourceRepository /** * mem store */ - protected Map resources = Collections.synchronizedMap(new HashMap()); + protected Map<String, StringResource> resources = Collections.synchronizedMap(new HashMap<>()); /** * Current Repository encoding. @@ -49,14 +50,16 @@ public class StringResourceRepositoryImpl implements StringResourceRepository /** * @see StringResourceRepository#getStringResource(java.lang.String) */ + @Override public StringResource getStringResource(final String name) { - return (StringResource)resources.get(name); + return resources.get(name); } /** * @see StringResourceRepository#putStringResource(java.lang.String, java.lang.String) */ + @Override public void putStringResource(final String name, final String body) { resources.put(name, new StringResource(body, getEncoding())); @@ -66,6 +69,7 @@ public class StringResourceRepositoryImpl implements StringResourceRepository * @see StringResourceRepository#putStringResource(java.lang.String, java.lang.String, java.lang.String) * @since 1.6 */ + @Override public void putStringResource(final String name, final String body, final String encoding) { resources.put(name, new StringResource(body, encoding)); @@ -74,6 +78,7 @@ public class StringResourceRepositoryImpl implements StringResourceRepository /** * @see StringResourceRepository#removeStringResource(java.lang.String) */ + @Override public void removeStringResource(final String name) { resources.remove(name); @@ -82,6 +87,7 @@ public class StringResourceRepositoryImpl implements StringResourceRepository /** * @see org.apache.velocity.runtime.resource.util.StringResourceRepository#getEncoding() */ + @Override public String getEncoding() { return encoding; @@ -90,6 +96,7 @@ public class StringResourceRepositoryImpl implements StringResourceRepository /** * @see org.apache.velocity.runtime.resource.util.StringResourceRepository#setEncoding(java.lang.String) */ + @Override public void setEncoding(final String encoding) { this.encoding = encoding; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java index c2afdfd1..397a3cd6 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java @@ -60,6 +60,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.SimpleNode, java.lang.Object) */ + @Override public Object visit(SimpleNode node, Object data) { data = node.childrenAccept(this, data); @@ -69,6 +70,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTprocess, java.lang.Object) */ + @Override public Object visit(ASTprocess node, Object data) { data = node.childrenAccept(this, data); @@ -78,6 +80,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTExpression, java.lang.Object) */ + @Override public Object visit(ASTExpression node, Object data) { data = node.childrenAccept(this, data); @@ -87,6 +90,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAssignment, java.lang.Object) */ + @Override public Object visit(ASTAssignment node, Object data) { data = node.childrenAccept(this, data); @@ -96,6 +100,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTOrNode, java.lang.Object) */ + @Override public Object visit(ASTOrNode node, Object data) { data = node.childrenAccept(this, data); @@ -105,6 +110,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAndNode, java.lang.Object) */ + @Override public Object visit(ASTAndNode node, Object data) { data = node.childrenAccept(this, data); @@ -114,6 +120,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEQNode, java.lang.Object) */ + @Override public Object visit(ASTEQNode node, Object data) { data = node.childrenAccept(this, data); @@ -123,6 +130,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNENode, java.lang.Object) */ + @Override public Object visit(ASTNENode node, Object data) { data = node.childrenAccept(this, data); @@ -132,6 +140,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLTNode, java.lang.Object) */ + @Override public Object visit(ASTLTNode node, Object data) { data = node.childrenAccept(this, data); @@ -141,6 +150,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGTNode, java.lang.Object) */ + @Override public Object visit(ASTGTNode node, Object data) { data = node.childrenAccept(this, data); @@ -150,6 +160,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLENode, java.lang.Object) */ + @Override public Object visit(ASTLENode node, Object data) { data = node.childrenAccept(this, data); @@ -159,6 +170,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGENode, java.lang.Object) */ + @Override public Object visit(ASTGENode node, Object data) { data = node.childrenAccept(this, data); @@ -168,6 +180,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAddNode, java.lang.Object) */ + @Override public Object visit(ASTAddNode node, Object data) { data = node.childrenAccept(this, data); @@ -177,6 +190,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSubtractNode, java.lang.Object) */ + @Override public Object visit(ASTSubtractNode node, Object data) { data = node.childrenAccept(this, data); @@ -186,6 +200,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMulNode, java.lang.Object) */ + @Override public Object visit(ASTMulNode node, Object data) { data = node.childrenAccept(this, data); @@ -195,6 +210,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDivNode, java.lang.Object) */ + @Override public Object visit(ASTDivNode node, Object data) { data = node.childrenAccept(this, data); @@ -204,6 +220,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTModNode, java.lang.Object) */ + @Override public Object visit(ASTModNode node, Object data) { data = node.childrenAccept(this, data); @@ -213,6 +230,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNotNode, java.lang.Object) */ + @Override public Object visit(ASTNotNode node, Object data) { data = node.childrenAccept(this, data); @@ -222,6 +240,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerLiteral, java.lang.Object) */ + @Override public Object visit(ASTIntegerLiteral node, Object data) { data = node.childrenAccept(this, data); @@ -232,6 +251,7 @@ public abstract class BaseVisitor implements ParserVisitor * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTFloatingPointLiteral node, Object data) { data = node.childrenAccept(this, data); @@ -241,6 +261,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTStringLiteral, java.lang.Object) */ + @Override public Object visit(ASTStringLiteral node, Object data) { data = node.childrenAccept(this, data); @@ -250,6 +271,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIdentifier, java.lang.Object) */ + @Override public Object visit(ASTIdentifier node, Object data) { data = node.childrenAccept(this, data); @@ -259,6 +281,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMethod, java.lang.Object) */ + @Override public Object visit(ASTMethod node, Object data) { data = node.childrenAccept(this, data); @@ -268,6 +291,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIndex, java.lang.Object) */ + @Override public Object visit(ASTIndex node, Object data) { data = node.childrenAccept(this, data); @@ -277,6 +301,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTReference, java.lang.Object) */ + @Override public Object visit(ASTReference node, Object data) { data = node.childrenAccept(this, data); @@ -286,6 +311,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTrue, java.lang.Object) */ + @Override public Object visit(ASTTrue node, Object data) { data = node.childrenAccept(this, data); @@ -295,6 +321,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFalse, java.lang.Object) */ + @Override public Object visit(ASTFalse node, Object data) { data = node.childrenAccept(this, data); @@ -304,6 +331,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTBlock, java.lang.Object) */ + @Override public Object visit(ASTBlock node, Object data) { data = node.childrenAccept(this, data); @@ -313,6 +341,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTText, java.lang.Object) */ + @Override public Object visit(ASTText node, Object data) { data = node.childrenAccept(this, data); @@ -322,6 +351,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIfStatement, java.lang.Object) */ + @Override public Object visit(ASTIfStatement node, Object data) { data = node.childrenAccept(this, data); @@ -331,6 +361,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseStatement, java.lang.Object) */ + @Override public Object visit(ASTElseStatement node, Object data) { data = node.childrenAccept(this, data); @@ -340,6 +371,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseIfStatement, java.lang.Object) */ + @Override public Object visit(ASTElseIfStatement node, Object data) { data = node.childrenAccept(this, data); @@ -349,6 +381,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTComment, java.lang.Object) */ + @Override public Object visit(ASTComment node, Object data) { data = node.childrenAccept(this, data); @@ -358,6 +391,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTextblock, java.lang.Object) */ + @Override public Object visit(ASTTextblock node, Object data) { data = node.childrenAccept(this, data); @@ -367,6 +401,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTObjectArray, java.lang.Object) */ + @Override public Object visit(ASTObjectArray node, Object data) { data = node.childrenAccept(this, data); @@ -376,6 +411,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTWord, java.lang.Object) */ + @Override public Object visit(ASTWord node, Object data) { data = node.childrenAccept(this, data); @@ -385,6 +421,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSetDirective, java.lang.Object) */ + @Override public Object visit(ASTSetDirective node, Object data) { data = node.childrenAccept(this, data); @@ -394,6 +431,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirectiveAssign, java.lang.Object) */ + @Override public Object visit(ASTDirectiveAssign node, Object data) { data = node.childrenAccept(this, data); @@ -403,6 +441,7 @@ public abstract class BaseVisitor implements ParserVisitor /** * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirective, java.lang.Object) */ + @Override public Object visit(ASTDirective node, Object data) { data = node.childrenAccept(this, data); @@ -413,6 +452,7 @@ public abstract class BaseVisitor implements ParserVisitor * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscapedDirective, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTEscapedDirective node, Object data) { data = node.childrenAccept(this, data); @@ -423,6 +463,7 @@ public abstract class BaseVisitor implements ParserVisitor * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscape, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTEscape node, Object data) { data = node.childrenAccept(this, data); @@ -433,6 +474,7 @@ public abstract class BaseVisitor implements ParserVisitor * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMap, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTMap node, Object data) { data = node.childrenAccept(this, data); @@ -443,6 +485,7 @@ public abstract class BaseVisitor implements ParserVisitor * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerRange, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTIntegerRange node, Object data) { data = node.childrenAccept(this, data); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java index da9441a2..baac596d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java @@ -19,7 +19,6 @@ package org.apache.velocity.runtime.visitor; * under the License. */ -import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.*; @@ -83,6 +82,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.SimpleNode, java.lang.Object) */ + @Override public Object visit(SimpleNode node, Object data) { return showNode(node,data); @@ -91,6 +91,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTprocess, java.lang.Object) */ + @Override public Object visit(ASTprocess node, Object data) { return showNode(node,data); @@ -99,6 +100,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTExpression, java.lang.Object) */ + @Override public Object visit(ASTExpression node, Object data) { return showNode(node,data); @@ -107,6 +109,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAssignment, java.lang.Object) */ + @Override public Object visit(ASTAssignment node, Object data) { return showNode(node,data); @@ -115,6 +118,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTOrNode, java.lang.Object) */ + @Override public Object visit(ASTOrNode node, Object data) { return showNode(node,data); @@ -123,6 +127,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAndNode, java.lang.Object) */ + @Override public Object visit(ASTAndNode node, Object data) { return showNode(node,data); @@ -131,6 +136,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEQNode, java.lang.Object) */ + @Override public Object visit(ASTEQNode node, Object data) { return showNode(node,data); @@ -139,6 +145,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNENode, java.lang.Object) */ + @Override public Object visit(ASTNENode node, Object data) { return showNode(node,data); @@ -147,6 +154,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLTNode, java.lang.Object) */ + @Override public Object visit(ASTLTNode node, Object data) { return showNode(node,data); @@ -155,6 +163,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGTNode, java.lang.Object) */ + @Override public Object visit(ASTGTNode node, Object data) { return showNode(node,data); @@ -163,6 +172,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLENode, java.lang.Object) */ + @Override public Object visit(ASTLENode node, Object data) { return showNode(node,data); @@ -171,6 +181,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGENode, java.lang.Object) */ + @Override public Object visit(ASTGENode node, Object data) { return showNode(node,data); @@ -179,6 +190,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAddNode, java.lang.Object) */ + @Override public Object visit(ASTAddNode node, Object data) { return showNode(node,data); @@ -187,6 +199,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSubtractNode, java.lang.Object) */ + @Override public Object visit(ASTSubtractNode node, Object data) { return showNode(node,data); @@ -195,6 +208,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMulNode, java.lang.Object) */ + @Override public Object visit(ASTMulNode node, Object data) { return showNode(node,data); @@ -203,6 +217,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDivNode, java.lang.Object) */ + @Override public Object visit(ASTDivNode node, Object data) { return showNode(node,data); @@ -211,6 +226,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTModNode, java.lang.Object) */ + @Override public Object visit(ASTModNode node, Object data) { return showNode(node,data); @@ -219,6 +235,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNotNode, java.lang.Object) */ + @Override public Object visit(ASTNotNode node, Object data) { return showNode(node,data); @@ -227,6 +244,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral, java.lang.Object) */ + @Override public Object visit(ASTFloatingPointLiteral node, Object data) { return showNode(node,data); @@ -236,6 +254,7 @@ public class NodeViewMode extends BaseVisitor * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerLiteral, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTIntegerLiteral node, Object data) { return showNode(node,data); @@ -244,6 +263,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTStringLiteral, java.lang.Object) */ + @Override public Object visit(ASTStringLiteral node, Object data) { return showNode(node,data); @@ -252,6 +272,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIdentifier, java.lang.Object) */ + @Override public Object visit(ASTIdentifier node, Object data) { return showNode(node,data); @@ -260,6 +281,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMethod, java.lang.Object) */ + @Override public Object visit(ASTMethod node, Object data) { return showNode(node,data); @@ -268,6 +290,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTReference, java.lang.Object) */ + @Override public Object visit(ASTReference node, Object data) { return showNode(node,data); @@ -276,6 +299,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTrue, java.lang.Object) */ + @Override public Object visit(ASTTrue node, Object data) { return showNode(node,data); @@ -284,6 +308,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFalse, java.lang.Object) */ + @Override public Object visit(ASTFalse node, Object data) { return showNode(node,data); @@ -292,6 +317,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTBlock, java.lang.Object) */ + @Override public Object visit(ASTBlock node, Object data) { return showNode(node,data); @@ -300,6 +326,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTText, java.lang.Object) */ + @Override public Object visit(ASTText node, Object data) { return showNode(node,data); @@ -308,6 +335,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIfStatement, java.lang.Object) */ + @Override public Object visit(ASTIfStatement node, Object data) { return showNode(node,data); @@ -316,6 +344,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseStatement, java.lang.Object) */ + @Override public Object visit(ASTElseStatement node, Object data) { return showNode(node,data); @@ -324,6 +353,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseIfStatement, java.lang.Object) */ + @Override public Object visit(ASTElseIfStatement node, Object data) { return showNode(node,data); @@ -332,6 +362,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTObjectArray, java.lang.Object) */ + @Override public Object visit(ASTObjectArray node, Object data) { return showNode(node,data); @@ -340,6 +371,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirective, java.lang.Object) */ + @Override public Object visit(ASTDirective node, Object data) { return showNode(node,data); @@ -348,6 +380,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTWord, java.lang.Object) */ + @Override public Object visit(ASTWord node, Object data) { return showNode(node,data); @@ -356,6 +389,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSetDirective, java.lang.Object) */ + @Override public Object visit(ASTSetDirective node, Object data) { return showNode(node,data); @@ -365,6 +399,7 @@ public class NodeViewMode extends BaseVisitor * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscapedDirective, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTEscapedDirective node, Object data) { return showNode(node,data); @@ -374,6 +409,7 @@ public class NodeViewMode extends BaseVisitor * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscape, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTEscape node, Object data) { return showNode(node,data); @@ -383,6 +419,7 @@ public class NodeViewMode extends BaseVisitor * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMap, java.lang.Object) * @since 1.5 */ + @Override public Object visit(ASTMap node, Object data) { return showNode(node,data); @@ -391,6 +428,7 @@ public class NodeViewMode extends BaseVisitor /** * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerRange, java.lang.Object) */ + @Override public Object visit(ASTIntegerRange node, Object data) { return showNode(node,data); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java index 6bbbcd7b..476b092d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java @@ -84,6 +84,7 @@ public class ArrayIterator implements Iterator * * @return The next object in the array. */ + @Override public Object next() { if (pos < size ) @@ -102,6 +103,7 @@ public class ArrayIterator implements Iterator * * @return Whether there is another element. */ + @Override public boolean hasNext() { return (pos < size ); @@ -110,6 +112,7 @@ public class ArrayIterator implements Iterator /** * No op--merely added to satisfy the <code>Iterator</code> interface. */ + @Override public void remove() { throw new UnsupportedOperationException(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayListWrapper.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayListWrapper.java index d7da5a7c..43afffcb 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayListWrapper.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayListWrapper.java @@ -38,11 +38,13 @@ public class ArrayListWrapper extends AbstractList this.array = array; } + @Override public Object get(int index) { return Array.get(array, index); } + @Override public Object set(int index, Object element) { Object old = get(index); @@ -50,11 +52,13 @@ public class ArrayListWrapper extends AbstractList return old; } + @Override public int size() { return Array.getLength(array); } + @Override public boolean isEmpty() { return Array.getLength(array) == 0; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java index b17eb681..34ddf556 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java @@ -60,7 +60,7 @@ public class ClassUtils { * @return the requested Class object * @throws ClassNotFoundException */ - public static Class getClass(String clazz) throws ClassNotFoundException + public static Class<?> getClass(String clazz) throws ClassNotFoundException { /** * Use the Thread context classloader if possible @@ -74,13 +74,13 @@ public class ClassUtils { } catch (ClassNotFoundException E) { - /** + /* * If not found with ThreadContext loader, fall thru to * try System classloader below (works around bug in ant). */ } } - /** + /* * Thread context classloader isn't working out, so use system loader. */ return Class.forName(clazz); @@ -115,11 +115,11 @@ public class ClassUtils { * @param name name of the resource * @return InputStream for the resource. */ - public static InputStream getResourceAsStream(Class claz, String name) + public static InputStream getResourceAsStream(Class<?> claz, String name) { InputStream result = null; - /** + /* * remove leading slash so path will work with classes in a JAR file */ while (name.startsWith("/")) @@ -139,7 +139,7 @@ public class ClassUtils { { result= classLoader.getResourceAsStream( name ); - /** + /* * for compatibility with texen / ant tasks, fall back to * old method when resource is not found. */ @@ -170,7 +170,7 @@ public class ClassUtils { * @return VelMethod object if the object is found, null if not matching method is found */ public static VelMethod getMethod(String methodName, Object[] params, - Class[] paramClasses, Object o, InternalContextAdapter context, + Class<?>[] paramClasses, Object o, InternalContextAdapter context, SimpleNode node, boolean strictRef) { VelMethod method = null; @@ -182,13 +182,13 @@ public class ClassUtils { boolean classObject = (o instanceof Class); MethodCacheKey mck = new MethodCacheKey(methodName, paramClasses, classObject); IntrospectionCacheData icd = context.icacheGet(mck); - Class clazz = classObject ? (Class)o : o.getClass(); + Class<?> clazz = classObject ? (Class<?>)o : o.getClass(); /* * like ASTIdentifier, if we have cache information, and the Class of * Object o is the same as that in the cache, we are safe. */ - if (icd != null && (o != null && icd.contextData == clazz)) + if (icd != null && icd.contextData == clazz) { /* * get the method from the cache @@ -203,7 +203,7 @@ public class ClassUtils { method = node.getRuntimeServices().getUberspect().getMethod(o, methodName, params, new Info(node.getTemplateName(), node.getLine(), node.getColumn())); - if ((method != null) && (o != null)) + if (method != null) { icd = new IntrospectionCacheData(); icd.contextData = clazz; @@ -224,7 +224,7 @@ public class ClassUtils { StringBuilder plist = new StringBuilder(); for (int i = 0; i < params.length; i++) { - Class param = paramClasses[i]; + Class<?> param = paramClasses[i]; plist.append(param == null ? "null" : param.getName()); if (i < params.length - 1) plist.append(", "); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/DeprecationAwareExtProperties.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/DeprecationAwareExtProperties.java index 49c15a9e..a67454a5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/DeprecationAwareExtProperties.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/DeprecationAwareExtProperties.java @@ -112,6 +112,7 @@ public class DeprecationAwareExtProperties extends Hashtable<String, Object> * @param value provided value * @return previous found value, if any */ + @Override public Object put(String key, Object value) { return super.put(translateKey(key), value); @@ -130,12 +131,12 @@ public class DeprecationAwareExtProperties extends Hashtable<String, Object> /** * Set of old property names for which a warning has already been emitted */ - private Set<String> warned = new HashSet<String>(); + private Set<String> warned = new HashSet<>(); /** * Property keys replacement map, from old key name to new key name */ - static private Map<String, String> propertiesReplacementMap = new HashMap(); + static private Map<String, String> propertiesReplacementMap = new HashMap<>(); static { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java index 8fbc559b..7eaddd32 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java @@ -23,7 +23,6 @@ import java.lang.reflect.Array; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.math.BigDecimal; -import java.math.BigInteger; import java.util.HashMap; import java.util.Map; @@ -48,19 +47,19 @@ public class DuckType SIZE("size"); final String name; - final Map<Class,Object> cache = new HashMap(); + final Map<Class<?>, Object> cache = new HashMap<>(); Types(String name) { this.name = name; } - void set(Class c, Object o) + void set(Class<?> c, Object o) { cache.put(c, o); } - Object get(Class c) + Object get(Class<?> c) { return cache.get(c); } @@ -250,7 +249,7 @@ public class DuckType try { // check cache - Class c = value.getClass(); + Class<?> c = value.getClass(); Object cached = type.get(c); if (cached == NO_METHOD) { @@ -280,7 +279,7 @@ public class DuckType } } - protected static Method findMethod(Class c, Types type) + protected static Method findMethod(Class<?> c, Types type) { if (c == null || c == Object.class) { @@ -291,7 +290,7 @@ public class DuckType { return m; } - for (Class i : c.getInterfaces()) + for (Class<?> i : c.getInterfaces()) { m = findMethod(i, type); if (m != null) @@ -307,7 +306,7 @@ public class DuckType return null; } - private static Method getMethod(Class c, String name) + private static Method getMethod(Class<?> c, String name) { if (Modifier.isPublic(c.getModifiers())) { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java index 41a3e866..ac88b093 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java @@ -51,6 +51,7 @@ public class EnumerationIterator implements Iterator * * @return The next object in the array. */ + @Override public Object next() { return enumeration.nextElement(); @@ -61,6 +62,7 @@ public class EnumerationIterator implements Iterator * * @return Whether there is another element. */ + @Override public boolean hasNext() { return enumeration.hasMoreElements(); @@ -69,6 +71,7 @@ public class EnumerationIterator implements Iterator /** * Unimplemented. No analogy in Enumeration */ + @Override public void remove() { // not implemented diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java index ed169460..b0f3bfd2 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java @@ -28,6 +28,7 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; @@ -180,13 +181,7 @@ public class ExtProperties extends DeprecationAwareExtProperties try { fileSeparator = (String) AccessController.doPrivileged( - new java.security.PrivilegedAction() - { - public Object run() - { - return System.getProperty("file.separator"); - } - }); + (PrivilegedAction) () -> System.getProperty("file.separator")); } catch (SecurityException ex) { @@ -211,7 +206,7 @@ public class ExtProperties extends DeprecationAwareExtProperties * you wish to perform operations with configuration * information in a particular order. */ - protected ArrayList<String> keysAsListed = new ArrayList<String>(); + protected ArrayList<String> keysAsListed = new ArrayList<>(); protected final static String START_TOKEN="${"; protected final static String END_TOKEN="}"; @@ -243,7 +238,7 @@ public class ExtProperties extends DeprecationAwareExtProperties * * @return the string with the interpolation taken care of */ - protected String interpolateHelper(String base, List priorVariables) + protected String interpolateHelper(String base, List<String> priorVariables) { // COPIED from [configuration] 2003-12-29 if (base == null) @@ -255,7 +250,7 @@ public class ExtProperties extends DeprecationAwareExtProperties // and add base as the first element if (priorVariables == null) { - priorVariables = new ArrayList(); + priorVariables = new ArrayList<>(); priorVariables.add(base); } @@ -472,6 +467,7 @@ public class ExtProperties extends DeprecationAwareExtProperties * * @return True if the object has more tokens. */ + @Override public boolean hasMoreTokens() { return super.hasMoreTokens(); @@ -482,6 +478,7 @@ public class ExtProperties extends DeprecationAwareExtProperties * * @return A String. */ + @Override public String nextToken() { StringBuilder buffer = new StringBuilder(); @@ -683,7 +680,7 @@ public class ExtProperties extends DeprecationAwareExtProperties file = new File(basePath + value); } - if (file != null && file.exists() && file.canRead()) + if (file.exists() && file.canRead()) { load(new FileInputStream(file)); } @@ -814,7 +811,7 @@ public class ExtProperties extends DeprecationAwareExtProperties if (current instanceof String) { // one object already in map - convert it to a vector - List values = new Vector(2); + List<Object> values = new Vector<>(2); values.add(current); values.add(value); put(key, values); @@ -968,7 +965,7 @@ public class ExtProperties extends DeprecationAwareExtProperties public Iterator<String> getKeys(String prefix) { Iterator<String> keys = getKeys(); - ArrayList<String> matchingKeys = new ArrayList(); + ArrayList<String> matchingKeys = new ArrayList<>(); while (keys.hasNext()) { @@ -993,14 +990,14 @@ public class ExtProperties extends DeprecationAwareExtProperties public ExtProperties subset(String prefix) { ExtProperties c = new ExtProperties(); - Iterator keys = getKeys(); + Iterator<String> keys = getKeys(); boolean validSubset = false; while (keys.hasNext()) { - Object key = keys.next(); + String key = keys.next(); - if (key instanceof String && ((String) key).startsWith(prefix)) + if (key.startsWith(prefix)) { if (!validSubset) { @@ -1014,14 +1011,14 @@ public class ExtProperties extends DeprecationAwareExtProperties * subset but it is a valid subset. */ String newKey = null; - if (((String) key).length() == prefix.length()) + if (key.length() == prefix.length()) { newKey = prefix; } else { - newKey = ((String) key).substring(prefix.length() + 1); + newKey = key.substring(prefix.length() + 1); } /* @@ -1049,11 +1046,11 @@ public class ExtProperties extends DeprecationAwareExtProperties */ public void display() { - Iterator i = getKeys(); + Iterator<String> i = getKeys(); while (i.hasNext()) { - String key = (String) i.next(); + String key = i.next(); Object value = get(key); System.out.println(key + " => " + value); } @@ -1181,10 +1178,10 @@ public class ExtProperties extends DeprecationAwareExtProperties { Object value = get(key); - List values; + List<Object> values; if (value instanceof String) { - values = new Vector(1); + values = new Vector<>(1); values.add(value); } @@ -1252,12 +1249,12 @@ public class ExtProperties extends DeprecationAwareExtProperties if (value instanceof List) { - return new Vector((List) value); + return new Vector<Object>((List) value); } else if (value instanceof String) { - Vector values = new Vector(1); + Vector<Object> values = new Vector<>(1); values.add(value); put(key, values); return values; @@ -1272,7 +1269,7 @@ public class ExtProperties extends DeprecationAwareExtProperties else { - return ((defaultValue == null) ? new Vector() : defaultValue); + return ((defaultValue == null) ? new Vector<>() : defaultValue); } } else diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java index 0ab31f09..ea722be8 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java @@ -40,6 +40,7 @@ public abstract class AbstractChainableUberspector extends UberspectImpl impleme * @see ChainableUberspector#wrap(org.apache.velocity.util.introspection.Uberspect) * @see #inner */ + @Override public void wrap(Uberspect inner) { this.inner = inner; @@ -51,6 +52,7 @@ public abstract class AbstractChainableUberspector extends UberspectImpl impleme * @see org.apache.velocity.util.introspection.Uberspect#init() */ //@Override + @Override public void init() { if (this.inner != null) { @@ -71,6 +73,7 @@ public abstract class AbstractChainableUberspector extends UberspectImpl impleme */ //@SuppressWarnings("unchecked") //@Override + @Override public Iterator getIterator(Object obj, Info i) { return (this.inner != null) ? this.inner.getIterator(obj, i) : null; @@ -83,6 +86,7 @@ public abstract class AbstractChainableUberspector extends UberspectImpl impleme * java.lang.Object[], org.apache.velocity.util.introspection.Info) */ //@Override + @Override public VelMethod getMethod(Object obj, String methodName, Object[] args, Info i) { return (this.inner != null) ? this.inner.getMethod(obj, methodName, args, i) : null; @@ -95,6 +99,7 @@ public abstract class AbstractChainableUberspector extends UberspectImpl impleme * org.apache.velocity.util.introspection.Info) */ //@Override + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i) { return (this.inner != null) ? this.inner.getPropertyGet(obj, identifier, i) : null; @@ -107,6 +112,7 @@ public abstract class AbstractChainableUberspector extends UberspectImpl impleme * java.lang.Object, org.apache.velocity.util.introspection.Info) */ //@Override + @Override public VelPropertySet getPropertySet(Object obj, String identifier, Object arg, Info i) { return (this.inner != null) ? this.inner.getPropertySet(obj, identifier, arg, i) : null; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java index 3847d806..37d3003a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java @@ -51,19 +51,19 @@ public class ClassFieldMap * Class passed into the constructor used to as * the basis for the Field map. */ - private final Class clazz; + private final Class<?> clazz; /** * String --> Field map, the key is the field name */ - private final Map fieldCache; + private final Map<String, Field> fieldCache; /** * Standard constructor * @param clazz The class for which this ClassMap gets constructed. * @param log logger */ - public ClassFieldMap(final Class clazz, final Logger log) + public ClassFieldMap(final Class<?> clazz, final Logger log) { this.clazz = clazz; this.log = log; @@ -87,7 +87,7 @@ public class ClassFieldMap * * @return The class object whose fields are cached by this map. */ - public Class getCachedClass() + public Class<?> getCachedClass() { return clazz; } @@ -100,7 +100,7 @@ public class ClassFieldMap */ public Field findField(final String name) { - return (Field)fieldCache.get(name); + return fieldCache.get(name); } /** @@ -108,23 +108,23 @@ public class ClassFieldMap * are taken from all the public fields * that our class, its parents and their implemented interfaces provide. */ - private Map createFieldCache() + private Map<String, Field> createFieldCache() { - Map fieldCache = new ConcurrentHashMap(); + Map<String, Field> fieldCache = new ConcurrentHashMap<>(); // // Looks through all elements in the class hierarchy. // // We ignore all SecurityExceptions that might happen due to SecurityManager restrictions (prominently // hit with Tomcat 5.5). // Ah, the miracles of Java for(;;) ... - for (Class classToReflect = getCachedClass(); classToReflect != null ; classToReflect = classToReflect.getSuperclass()) + for (Class<?> classToReflect = getCachedClass(); classToReflect != null ; classToReflect = classToReflect.getSuperclass()) { if (Modifier.isPublic(classToReflect.getModifiers())) { populateFieldCacheWith(fieldCache, classToReflect); } - Class [] interfaces = classToReflect.getInterfaces(); - for (Class anInterface : interfaces) + Class<?> [] interfaces = classToReflect.getInterfaces(); + for (Class<?> anInterface : interfaces) { populateFieldCacheWithInterface(fieldCache, anInterface); } @@ -134,20 +134,20 @@ public class ClassFieldMap } /* recurses up interface hierarchy to get all super interfaces (VELOCITY-689) */ - private void populateFieldCacheWithInterface(Map fieldCache, Class iface) + private void populateFieldCacheWithInterface(Map<String, Field> fieldCache, Class<?> iface) { if (Modifier.isPublic(iface.getModifiers())) { populateFieldCacheWith(fieldCache, iface); } - Class[] supers = iface.getInterfaces(); - for (Class aSuper : supers) + Class<?>[] supers = iface.getInterfaces(); + for (Class<?> aSuper : supers) { populateFieldCacheWithInterface(fieldCache, aSuper); } } - private void populateFieldCacheWith(Map fieldCache, Class classToReflect) + private void populateFieldCacheWith(Map<String, Field> fieldCache, Class<?> classToReflect) { if (debugReflection) { diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java index b29a3ac1..d46f7e1d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java @@ -53,7 +53,7 @@ public class ClassMap * Class passed into the constructor used to as * the basis for the Method map. */ - private final Class clazz; + private final Class<?> clazz; private final MethodCache methodCache; @@ -62,7 +62,7 @@ public class ClassMap * @param clazz The class for which this ClassMap gets constructed. * @param log logger */ - public ClassMap(final Class clazz, final Logger log) + public ClassMap(final Class<?> clazz, final Logger log) { this(clazz, log, null); } @@ -74,7 +74,7 @@ public class ClassMap * @param conversionHandler conversion handler * @since 2.0 */ - public ClassMap(final Class clazz, final Logger log, final TypeConversionHandler conversionHandler) + public ClassMap(final Class<?> clazz, final Logger log, final TypeConversionHandler conversionHandler) { this.clazz = clazz; this.log = log; @@ -98,7 +98,7 @@ public class ClassMap * * @return The class object whose methods are cached by this map. */ - public Class getCachedClass() + public Class<?> getCachedClass() { return clazz; } @@ -139,14 +139,14 @@ public class ClassMap // hit the public elements sooner or later because we reflect all the public elements anyway. // // Ah, the miracles of Java for(;;) ... - for (Class classToReflect = getCachedClass(); classToReflect != null ; classToReflect = classToReflect.getSuperclass()) + for (Class<?> classToReflect = getCachedClass(); classToReflect != null ; classToReflect = classToReflect.getSuperclass()) { if (Modifier.isPublic(classToReflect.getModifiers())) { populateMethodCacheWith(methodCache, classToReflect); } - Class [] interfaces = classToReflect.getInterfaces(); - for (Class anInterface : interfaces) + Class<?> [] interfaces = classToReflect.getInterfaces(); + for (Class<?> anInterface : interfaces) { populateMethodCacheWithInterface(methodCache, anInterface); } @@ -156,20 +156,20 @@ public class ClassMap } /* recurses up interface heirarchy to get all super interfaces (VELOCITY-689) */ - private void populateMethodCacheWithInterface(MethodCache methodCache, Class iface) + private void populateMethodCacheWithInterface(MethodCache methodCache, Class<?> iface) { if (Modifier.isPublic(iface.getModifiers())) { populateMethodCacheWith(methodCache, iface); } - Class[] supers = iface.getInterfaces(); - for (Class aSuper : supers) + Class<?>[] supers = iface.getInterfaces(); + for (Class<?> aSuper : supers) { populateMethodCacheWithInterface(methodCache, aSuper); } } - private void populateMethodCacheWith(MethodCache methodCache, Class classToReflect) + private void populateMethodCacheWith(MethodCache methodCache, Class<?> classToReflect) { if (debugReflection) { @@ -206,7 +206,7 @@ public class ClassMap private static final String NULL_ARG = Object.class.getName(); - private static final Map convertPrimitives = new HashMap(); + private static final Map<Class<?>, String> convertPrimitives = new HashMap(); static { @@ -227,7 +227,7 @@ public class ClassMap * Cache of Methods, or CACHE_MISS, keyed by method * name and actual arguments used to find it. */ - private final Map cache = new ConcurrentHashMap(); + private final Map<Object, Object> cache = new ConcurrentHashMap<>(); /** Map of methods that are searchable according to method parameters to find a match */ private final MethodMap methodMap; @@ -319,7 +319,7 @@ public class ClassMap */ private String makeMethodKey(final Method method) { - Class[] parameterTypes = method.getParameterTypes(); + Class<?>[] parameterTypes = method.getParameterTypes(); int args = parameterTypes.length; if (args == 0) { @@ -328,7 +328,7 @@ public class ClassMap StringBuilder methodKey = new StringBuilder((args+1)*16).append(method.getName()); - for (Class parameterType : parameterTypes) + for (Class<?> parameterType : parameterTypes) { /* * If the argument type is primitive then we want diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandler.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandler.java index 5f5a2b43..77222639 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandler.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandler.java @@ -44,7 +44,7 @@ public interface ConversionHandler * @return null if no conversion is needed, or the appropriate Converter object * @since 2.0 */ - boolean isExplicitlyConvertible(Class formal, Class actual, boolean possibleVarArg); + boolean isExplicitlyConvertible(Class<?> formal, Class<?> actual, boolean possibleVarArg); /** * Returns the appropriate Converter object needed for an explicit conversion @@ -55,7 +55,7 @@ public interface ConversionHandler * @return null if no conversion is needed, or the appropriate Converter object * @since 2.0 */ - Converter getNeededConverter(final Class formal, final Class actual); + Converter getNeededConverter(final Class<?> formal, final Class<?> actual); /** * Add the given converter to the handler. Implementation should be thread-safe. @@ -65,6 +65,6 @@ public interface ConversionHandler * @param converter converter * @since 2.0 */ - void addConverter(Class formal, Class actual, Converter converter); + void addConverter(Class<?> formal, Class<?> actual, Converter converter); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java index 0638f19c..271ad47a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java @@ -39,5 +39,5 @@ public class IntrospectionCacheData * Class of context data object associated with the introspection * information */ - public Class contextData; + public Class<?> contextData; } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java index 78e0ad79..c3a2979b 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java @@ -29,7 +29,6 @@ import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; import java.util.HashMap; import java.util.Map; -import java.util.Set; /** * @@ -48,7 +47,7 @@ public class IntrospectionUtils /** * boxing helper maps for standard types */ - static Map<Class, Class> boxingMap, unboxingMap; + static Map<Class<?>, Class<?>> boxingMap, unboxingMap; static { @@ -63,7 +62,7 @@ public class IntrospectionUtils boxingMap.put(Double.TYPE, Double.class); unboxingMap = new HashMap<>(); - for (Map.Entry<Class,Class> entry : boxingMap.entrySet()) + for (Map.Entry<Class<?>, Class<?>> entry : boxingMap.entrySet()) { unboxingMap.put(entry.getValue(), entry.getKey()); } @@ -74,9 +73,9 @@ public class IntrospectionUtils * @param clazz input class * @return boxed class */ - public static Class getBoxedClass(Class clazz) + public static Class<?> getBoxedClass(Class clazz) { - Class boxed = boxingMap.get(clazz); + Class<?> boxed = boxingMap.get(clazz); return boxed == null ? clazz : boxed; } @@ -85,9 +84,9 @@ public class IntrospectionUtils * @param clazz input class * @return unboxed class */ - public static Class getUnboxedClass(Class clazz) + public static Class<?> getUnboxedClass(Class clazz) { - Class unboxed = unboxingMap.get(clazz); + Class<?> unboxed = unboxingMap.get(clazz); return unboxed == null ? clazz : unboxed; } @@ -96,24 +95,24 @@ public class IntrospectionUtils * @param type the input Type * @return found Class, if any */ - public static Class getTypeClass(Type type) + public static Class<?> getTypeClass(Type type) { if (type == null) { return null; } - if (type instanceof Class) + if (type instanceof Class<?>) { - return (Class)type; + return (Class<?>)type; } else if (type instanceof ParameterizedType) { - return (Class)((ParameterizedType)type).getRawType(); + return (Class<?>)((ParameterizedType)type).getRawType(); } else if (type instanceof GenericArrayType) { Type componentType = ((GenericArrayType)type).getGenericComponentType(); - Class componentClass = getTypeClass(componentType); + Class<?> componentClass = getTypeClass(componentType); if (componentClass != null) { return Array.newInstance(componentClass, 0).getClass(); @@ -153,10 +152,10 @@ public class IntrospectionUtils * the formal type. */ public static boolean isMethodInvocationConvertible(Type formal, - Class actual, + Class<?> actual, boolean possibleVarArg) { - Class formalClass = getTypeClass(formal); + Class<?> formalClass = getTypeClass(formal); if (formalClass != null) { /* if it's a null, it means the arg was null */ @@ -177,8 +176,8 @@ public class IntrospectionUtils /* Check for boxing */ if (!formalClass.isPrimitive() && actual.isPrimitive()) { - Class boxed = boxingMap.get(actual); - if (boxed != null && boxed == formalClass || formalClass.isAssignableFrom(boxed)) return true; + Class<?> boxed = boxingMap.get(actual); + if (boxed != null && (boxed == formalClass || formalClass.isAssignableFrom(boxed))) return true; } if (formalClass.isPrimitive()) @@ -270,10 +269,10 @@ public class IntrospectionUtils * subject to widening conversion to formal. */ public static boolean isStrictMethodInvocationConvertible(Type formal, - Class actual, + Class<?> actual, boolean possibleVarArg) { - Class formalClass = getTypeClass(formal); + Class<?> formalClass = getTypeClass(formal); if (formalClass != null) { /* Check for nullity */ diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java index 512d434e..29756fbf 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java @@ -85,7 +85,8 @@ public class Introspector extends IntrospectorBase * @return The desired Method object. * @throws IllegalArgumentException When the parameters passed in can not be used for introspection. */ - public Method getMethod(final Class c, final String name, final Object[] params) + @Override + public Method getMethod(final Class<?> c, final String name, final Object[] params) throws IllegalArgumentException { try diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java index 6b7eb5d8..bce0d4c9 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java @@ -86,7 +86,7 @@ public abstract class IntrospectorBase * @throws NullPointerException When the parameters passed in can not be used for introspection because null. * @throws MethodMap.AmbiguousException When the method map contains more than one match for the requested signature. */ - public Method getMethod(final Class c, final String name, final Object[] params) + public Method getMethod(final Class<?> c, final String name, final Object[] params) throws MethodMap.AmbiguousException { IntrospectorCache ic = getIntrospectorCache(); @@ -109,7 +109,7 @@ public abstract class IntrospectorBase * @return The desired Field object. * @throws IllegalArgumentException When the parameters passed in can not be used for introspection. */ - public Field getField(final Class c, final String name) + public Field getField(final Class<?> c, final String name) throws IllegalArgumentException { IntrospectorCache ic = getIntrospectorCache(); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java index 16d30ee1..daa463ef 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java @@ -50,12 +50,12 @@ public final class IntrospectorCache /** * Holds the method maps for the classes we know about. Map: Class --> ClassMap object. */ - private final Map classMapCache = new HashMap(); + private final Map<Class<?>, ClassMap> classMapCache = new HashMap<>(); /** * Holds the field maps for the classes we know about. Map: Class --> ClassFieldMap object. */ - private final Map classFieldMapCache = new HashMap(); + private final Map<Class<?>, ClassFieldMap> classFieldMapCache = new HashMap<>(); /** * Keep the names of the classes in another map. This is needed for a multi-classloader environment where it is possible @@ -63,7 +63,7 @@ public final class IntrospectorCache * two Class objects have the same name, a <code>classMethodMaps.get(Foo.class)</code> will return null. For that case, we * keep a set of class names to recognize this case. */ - private final Set classNameCache = new HashSet(); + private final Set<String> classNameCache = new HashSet<>(); /** * Conversion handler @@ -103,9 +103,9 @@ public final class IntrospectorCache * @param c The class to look up. * @return A ClassMap object or null if it does not exist in the cache. */ - public ClassMap get(final Class c) + public ClassMap get(final Class<?> c) { - ClassMap classMap = (ClassMap)classMapCache.get(Validate.notNull(c)); + ClassMap classMap = classMapCache.get(Validate.notNull(c)); if (classMap == null) { /* @@ -133,9 +133,9 @@ public final class IntrospectorCache * @param c The class to look up. * @return A ClassFieldMap object or null if it does not exist in the cache. */ - public ClassFieldMap getFieldMap(final Class c) + public ClassFieldMap getFieldMap(final Class<?> c) { - ClassFieldMap classFieldMap = (ClassFieldMap)classFieldMapCache.get(Validate.notNull(c)); + ClassFieldMap classFieldMap = classFieldMapCache.get(Validate.notNull(c)); if (classFieldMap == null) { /* @@ -163,7 +163,7 @@ public final class IntrospectorCache * @param c The class for which the class map gets generated. * @return A ClassMap object. */ - public ClassMap put(final Class c) + public ClassMap put(final Class<?> c) { final ClassMap classMap = new ClassMap(c, log, conversionHandler); final ClassFieldMap classFieldMap = new ClassFieldMap(c, log); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java index 6f91581e..8b219275 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java @@ -58,6 +58,7 @@ public class LinkingUberspector extends AbstractChainableUberspector * @see org.apache.velocity.util.introspection.Uberspect#init() */ //@Override + @Override public void init() { leftUberspect.init(); @@ -72,6 +73,7 @@ public class LinkingUberspector extends AbstractChainableUberspector */ //@SuppressWarnings("unchecked") //@Override + @Override public Iterator getIterator(Object obj, Info i) { Iterator it = leftUberspect.getIterator(obj,i); @@ -85,6 +87,7 @@ public class LinkingUberspector extends AbstractChainableUberspector * java.lang.Object[], org.apache.velocity.util.introspection.Info) */ //@Override + @Override public VelMethod getMethod(Object obj, String methodName, Object[] args, Info i) { VelMethod method = leftUberspect.getMethod(obj,methodName,args,i); @@ -98,6 +101,7 @@ public class LinkingUberspector extends AbstractChainableUberspector * org.apache.velocity.util.introspection.Info) */ //@Override + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i) { VelPropertyGet getter = leftUberspect.getPropertyGet(obj,identifier,i); @@ -111,6 +115,7 @@ public class LinkingUberspector extends AbstractChainableUberspector * java.lang.Object, org.apache.velocity.util.introspection.Info) */ //@Override + @Override public VelPropertySet getPropertySet(Object obj, String identifier, Object arg, Info i) { VelPropertySet setter = leftUberspect.getPropertySet(obj,identifier,arg,i); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java index 51bac9bb..1d0408bb 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java @@ -20,7 +20,6 @@ package org.apache.velocity.util.introspection; */ import org.apache.commons.lang3.reflect.TypeUtils; -import org.apache.velocity.exception.VelocityException; import java.lang.reflect.Method; import java.lang.reflect.Type; @@ -79,7 +78,7 @@ public class MethodMap /** * Keep track of all methods with the same name. */ - Map methodByNameMap = new ConcurrentHashMap(); + Map<String, List<Method>> methodByNameMap = new ConcurrentHashMap<>(); /** * Add a method to a list of methods by name. @@ -91,11 +90,11 @@ public class MethodMap { String methodName = method.getName(); - List l = get( methodName ); + List<Method> l = get( methodName ); if ( l == null) { - l = new ArrayList(); + l = new ArrayList<>(); methodByNameMap.put(methodName, l); } @@ -108,9 +107,9 @@ public class MethodMap * @param key * @return List list of methods */ - public List get(String key) + public List<Method> get(String key) { - return (List) methodByNameMap.get(key); + return methodByNameMap.get(key); } /** @@ -144,7 +143,7 @@ public class MethodMap public Method find(String methodName, Object[] args) throws AmbiguousException { - List methodList = get(methodName); + List<Method> methodList = get(methodName); if (methodList == null) { @@ -152,7 +151,7 @@ public class MethodMap } int l = args.length; - Class[] classes = new Class[l]; + Class<?>[] classes = new Class[l]; for(int i = 0; i < l; ++i) { @@ -188,7 +187,7 @@ public class MethodMap /* whether the method has varrags */ boolean varargs; - Match(Method method, int applicability, Class[] unboxedArgs) + Match(Method method, int applicability, Class<?>[] unboxedArgs) { this.method = method; this.applicability = applicability; @@ -198,19 +197,19 @@ public class MethodMap } } - private static boolean onlyNullOrObjects(Class[] args) + private static boolean onlyNullOrObjects(Class<?>[] args) { - for (Class cls : args) + for (Class<?> cls : args) { if (cls != null && cls != Object.class) return false; } return args.length > 0; } - private Method getBestMatch(List<Method> methods, Class[] args) + private Method getBestMatch(List<Method> methods, Class<?>[] args) { - List<Match> bestMatches = new LinkedList<Match>(); - Class[] unboxedArgs = new Class[args.length]; + List<Match> bestMatches = new LinkedList<>(); + Class<?>[] unboxedArgs = new Class<?>[args.length]; for (int i = 0; i < args.length; ++i) { unboxedArgs[i] = IntrospectionUtils.getUnboxedClass(args[i]); @@ -415,8 +414,8 @@ public class MethodMap int fromC2toC1 = STRICTLY_CONVERTIBLE; for(int i = 0; i < t1.length; ++i) { - Class c1 = t1[i] == null ? null : IntrospectionUtils.getTypeClass(t1[i]); - Class c2 = t2[i] == null ? null : IntrospectionUtils.getTypeClass(t2[i]); + Class<?> c1 = t1[i] == null ? null : IntrospectionUtils.getTypeClass(t1[i]); + Class<?> c2 = t2[i] == null ? null : IntrospectionUtils.getTypeClass(t2[i]); boolean last = !fixedLengths && (i == t1.length - 1); if (t1[i] == null && t2[i] != null || t1[i] != null && t2[i] == null || !t1[i].equals(t2[i])) { @@ -532,7 +531,7 @@ public class MethodMap * 2 = implicitly applicable (i.e. using JAva implicit boxing/unboxing and primitive types widening) * 3 = strictly applicable */ - private int getApplicability(Method method, Class[] classes) + private int getApplicability(Method method, Class<?>[] classes) { Type[] methodArgs = method.getGenericParameterTypes(); int ret = STRICTLY_CONVERTIBLE; @@ -656,7 +655,7 @@ public class MethodMap * @param possibleVarArg * @return convertible */ - private boolean isConvertible(Type formal, Class actual, boolean possibleVarArg) + private boolean isConvertible(Type formal, Class<?> actual, boolean possibleVarArg) { return IntrospectionUtils. isMethodInvocationConvertible(formal, actual, possibleVarArg); @@ -671,7 +670,7 @@ public class MethodMap * @param possibleVarArg * @return convertible */ - private static boolean isStrictConvertible(Type formal, Class actual, boolean possibleVarArg) + private static boolean isStrictConvertible(Type formal, Class<?> actual, boolean possibleVarArg) { return IntrospectionUtils. isStrictMethodInvocationConvertible(formal, actual, possibleVarArg); @@ -685,7 +684,7 @@ public class MethodMap * @param possibleVarArg * @return */ - private boolean isExplicitlyConvertible(Type formal, Class actual, boolean possibleVarArg) + private boolean isExplicitlyConvertible(Type formal, Class<?> actual, boolean possibleVarArg) { return conversionHandler != null && conversionHandler.isExplicitlyConvertible(formal, actual, possibleVarArg); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java index 2725809d..6355dfa0 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java @@ -37,6 +37,6 @@ public interface SecureIntrospectorControl * * @return true if method may be called on object */ - boolean checkObjectExecutePermission(Class clazz, String method); + boolean checkObjectExecutePermission(Class<?> clazz, String method); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java index 38ac7ce8..fea03301 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java @@ -59,7 +59,8 @@ public class SecureIntrospectorImpl extends Introspector implements SecureIntros * @return Method object retrieved by Introspector * @throws IllegalArgumentException The parameter passed in were incorrect. */ - public Method getMethod(Class clazz, String methodName, Object[] params) + @Override + public Method getMethod(Class<?> clazz, String methodName, Object[] params) throws IllegalArgumentException { if (!checkObjectExecutePermission(clazz, methodName)) @@ -85,9 +86,10 @@ public class SecureIntrospectorImpl extends Introspector implements SecureIntros * @param methodName Name of method to be called * @see org.apache.velocity.util.introspection.SecureIntrospectorControl#checkObjectExecutePermission(java.lang.Class, java.lang.String) */ - public boolean checkObjectExecutePermission(Class clazz, String methodName) + @Override + public boolean checkObjectExecutePermission(Class<?> clazz, String methodName) { - /** + /* * check for wait and notify */ if (methodName != null && @@ -96,7 +98,7 @@ public class SecureIntrospectorImpl extends Introspector implements SecureIntros return false; } - /** + /* * Always allow the most common classes - Number, Boolean and String */ else if (Number.class.isAssignableFrom(clazz)) @@ -112,7 +114,7 @@ public class SecureIntrospectorImpl extends Introspector implements SecureIntros return true; } - /** + /* * Always allow Class.getName() */ else if (Class.class.isAssignableFrom(clazz) && @@ -121,7 +123,7 @@ public class SecureIntrospectorImpl extends Introspector implements SecureIntros return true; } - /** + /* * check the classname (minus any array info) * whether it matches disallowed classes or packages */ diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java index 89d25b4d..bce6d084 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java @@ -45,6 +45,7 @@ public class SecureUberspector extends UberspectImpl * makes sure that the log gets set before this is called, * we can initialize the Introspector using the log object. */ + @Override public void init() { String [] badPackages = rsvc.getConfiguration() @@ -64,6 +65,7 @@ public class SecureUberspector extends UberspectImpl * @param i line, column, template info * @return Iterator for object */ + @Override public Iterator getIterator(Object obj, Info i) { if (obj != null) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandler.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandler.java index 6eb04954..6408019e 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandler.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandler.java @@ -42,7 +42,7 @@ public interface TypeConversionHandler * @return null if no conversion is needed, or the appropriate Converter object * @since 2.1 */ - boolean isExplicitlyConvertible(Type formal, Class actual, boolean possibleVarArg); + boolean isExplicitlyConvertible(Type formal, Class<?> actual, boolean possibleVarArg); /** * Returns the appropriate Converter object needed for an explicit conversion @@ -53,7 +53,7 @@ public interface TypeConversionHandler * @return null if no conversion is needed, or the appropriate Converter object * @since 2.1 */ - Converter getNeededConverter(Type formal, Class actual); + Converter<?> getNeededConverter(Type formal, Class<?> actual); /** * Add the given converter to the handler. Implementation should be thread-safe. @@ -63,6 +63,6 @@ public interface TypeConversionHandler * @param converter converter * @since 2.1 */ - void addConverter(Type formal, Class actual, Converter converter); + void addConverter(Type formal, Class<?> actual, Converter<?> converter); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandlerImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandlerImpl.java index e5bed092..ced7ca81 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandlerImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/TypeConversionHandlerImpl.java @@ -47,22 +47,22 @@ public class TypeConversionHandlerImpl implements TypeConversionHandler /** * standard narrowing and string parsing conversions. */ - static Map<Pair<String, String>, Converter> standardConverterMap; + static Map<Pair<String, String>, Converter<?>> standardConverterMap; /** * basic toString converter */ - static Converter toString; + static Converter<?> toString; /** * cache miss converter */ - static Converter cacheMiss; + static Converter<?> cacheMiss; /** * a converters cache map, initialized with the standard narrowing and string parsing conversions. */ - Map<Pair<String, String>, Converter> converterCacheMap; + Map<Pair<String, String>, Converter<?>> converterCacheMap; static final String BOOLEAN_TYPE = "boolean"; static final String BYTE_TYPE = "byte"; @@ -618,13 +618,13 @@ public class TypeConversionHandlerImpl implements TypeConversionHandler * @since 2.1 */ @Override - public boolean isExplicitlyConvertible(Type formal, Class actual, boolean possibleVarArg) + public boolean isExplicitlyConvertible(Type formal, Class<?> actual, boolean possibleVarArg) { /* * for consistency, we also have to check standard implicit convertibility * since it may not have been checked before by the calling code */ - Class formalClass = IntrospectionUtils.getTypeClass(formal); + Class<?> formalClass = IntrospectionUtils.getTypeClass(formal); if (formalClass != null && formalClass == actual || IntrospectionUtils.isMethodInvocationConvertible(formal, actual, possibleVarArg) || getNeededConverter(formal, actual) != null) @@ -655,7 +655,7 @@ public class TypeConversionHandlerImpl implements TypeConversionHandler * @since 2.1 */ @Override - public Converter getNeededConverter(Type formal, Class actual) + public Converter<?> getNeededConverter(Type formal, Class<?> actual) { if (actual == null) { @@ -664,14 +664,14 @@ public class TypeConversionHandlerImpl implements TypeConversionHandler Pair<String, String> key = Pair.of(formal.getTypeName(), actual.getTypeName()); /* first check for a standard conversion */ - Converter converter = standardConverterMap.get(key); + Converter<?> converter = standardConverterMap.get(key); if (converter == null) { /* then the converters cache map */ converter = converterCacheMap.get(key); if (converter == null) { - Class formalClass = IntrospectionUtils.getTypeClass(formal); + Class<?> formalClass = IntrospectionUtils.getTypeClass(formal); /* check for conversion towards string */ if (formal == String.class) { @@ -699,11 +699,11 @@ public class TypeConversionHandlerImpl implements TypeConversionHandler * @since 2.1 */ @Override - public void addConverter(Type formal, Class actual, Converter converter) + public void addConverter(Type formal, Class<?> actual, Converter<?> converter) { Pair<String, String> key = Pair.of(formal.getTypeName(), actual.getTypeName()); converterCacheMap.put(key, converter); - Class formalClass = IntrospectionUtils.getTypeClass(formal); + Class<?> formalClass = IntrospectionUtils.getTypeClass(formal); if (formalClass != null) { if (formalClass.isPrimitive()) @@ -713,7 +713,7 @@ public class TypeConversionHandlerImpl implements TypeConversionHandler } else { - Class unboxedFormal = IntrospectionUtils.getUnboxedClass(formalClass); + Class<?> unboxedFormal = IntrospectionUtils.getUnboxedClass(formalClass); if (unboxedFormal != formalClass) { key = Pair.of(unboxedFormal.getTypeName(), actual.getTypeName()); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java index 4d5730b8..577232f5 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java @@ -19,7 +19,6 @@ package org.apache.velocity.util.introspection; * under the License. */ -import org.apache.commons.lang3.Conversion; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; @@ -83,6 +82,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * makes sure that the log gets set before this is called, * we can initialize the Introspector using the log object. */ + @Override public void init() { introspector = new Introspector(log, conversionHandler); @@ -97,6 +97,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * sets the runtime services * @param rs runtime services */ + @Override @SuppressWarnings("deprecation") public void setRuntimeServices(RuntimeServices rs) { @@ -140,25 +141,25 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware conversionHandler = new TypeConversionHandler() { @Override - public boolean isExplicitlyConvertible(Type formal, Class actual, boolean possibleVarArg) + public boolean isExplicitlyConvertible(Type formal, Class<?> actual, boolean possibleVarArg) { - Class formalClass = IntrospectionUtils.getTypeClass(formal); + Class<?> formalClass = IntrospectionUtils.getTypeClass(formal); if (formalClass != null) return ch.isExplicitlyConvertible(formalClass, actual, possibleVarArg); else return false; } @Override - public Converter getNeededConverter(Type formal, Class actual) + public Converter<?> getNeededConverter(Type formal, Class<?> actual) { - Class formalClass = IntrospectionUtils.getTypeClass(formal); + Class<?> formalClass = IntrospectionUtils.getTypeClass(formal); if (formalClass != null) return ch.getNeededConverter(formalClass, actual); else return null; } @Override - public void addConverter(Type formal, Class actual, Converter converter) + public void addConverter(Type formal, Class<?> actual, Converter<?> converter) { - Class formalClass = IntrospectionUtils.getTypeClass(formal); + Class<?> formalClass = IntrospectionUtils.getTypeClass(formal); if (formalClass != null) ch.addConverter(formalClass, actual, converter); else throw new UnsupportedOperationException("This conversion handler doesn't know how to handle Type: " + formal.getTypeName()); } @@ -201,6 +202,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @param i Info about the object's location. * @return An {@link Iterator} object. */ + @Override public Iterator getIterator(Object obj, Info i) { if (obj.getClass().isArray()) @@ -236,11 +238,11 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware // look for an iterator() method to support the JDK5 Iterable // interface or any user tools/DTOs that want to work in // foreach without implementing the Collection interface - Class type = obj.getClass(); + Class<?> type = obj.getClass(); try { Method iter = type.getMethod("iterator"); - Class returns = iter.getReturnType(); + Class<?> returns = iter.getReturnType(); if (Iterator.class.isAssignableFrom(returns)) { try @@ -283,6 +285,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @param i * @return A Velocity Method. */ + @Override public VelMethod getMethod(Object obj, String methodName, Object[] args, Info i) { if (obj == null) @@ -296,7 +299,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware return new VelMethodImpl(m, false, getNeededConverters(m.getGenericParameterTypes(), args)); } - Class cls = obj.getClass(); + Class<?> cls = obj.getClass(); // if it's an array if (cls.isArray()) { @@ -312,7 +315,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware // watch for classes, to allow calling their static methods (VELOCITY-102) else if (cls == Class.class) { - m = introspector.getMethod((Class)obj, methodName, args); + m = introspector.getMethod((Class<?>)obj, methodName, args); if (m != null) { return new VelMethodImpl(m, false, getNeededConverters(m.getGenericParameterTypes(), args)); @@ -325,17 +328,17 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * get the list of needed converters to adapt passed argument types to method types * @return null if not conversion needed, otherwise an array containing needed converters */ - private Converter[] getNeededConverters(Type[] expected, Object[] provided) + private Converter<?>[] getNeededConverters(Type[] expected, Object[] provided) { if (conversionHandler == null) return null; // var args are not handled here - CB TODO int n = Math.min(expected.length, provided.length); - Converter[] converters = null; + Converter<?>[] converters = null; for (int i = 0; i < n; ++i) { Object arg = provided[i]; if (arg == null) continue; - Converter converter = conversionHandler.getNeededConverter(expected[i], arg.getClass()); + Converter<?> converter = conversionHandler.getNeededConverter(expected[i], arg.getClass()); if (converter != null) { if (converters == null) @@ -355,6 +358,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @param i * @return A Velocity Getter Method. */ + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i) { if (obj == null) @@ -362,7 +366,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware return null; } - Class claz = obj.getClass(); + Class<?> claz = obj.getClass(); /* * first try for a getFoo() type of property @@ -417,6 +421,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @param i * @return A Velocity Setter method. */ + @Override public VelPropertySet getPropertySet(Object obj, String identifier, Object arg, Info i) { @@ -425,7 +430,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware return null; } - Class claz = obj.getClass(); + Class<?> claz = obj.getClass(); /* * first try for a setFoo() type of property @@ -455,12 +460,12 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * Implementation of VelMethod */ - public class VelMethodImpl implements VelMethod + public static class VelMethodImpl implements VelMethod { final Method method; Boolean isVarArg; boolean wrapArray; - Converter converters[]; + Converter<?> converters[]; /** * @param m @@ -486,7 +491,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @param converters * @since 2.0 */ - public VelMethodImpl(Method method, boolean wrapArray, Converter[] converters) + public VelMethodImpl(Method method, boolean wrapArray, Converter<?>[] converters) { this.method = method; this.wrapArray = wrapArray; @@ -504,6 +509,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @return invocation result * @see VelMethod#invoke(java.lang.Object, java.lang.Object[]) */ + @Override public Object invoke(Object o, Object[] actual) throws IllegalAccessException, InvocationTargetException { @@ -515,11 +521,11 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware if (isVarArg()) { - Class[] formal = method.getParameterTypes(); + Class<?>[] formal = method.getParameterTypes(); int index = formal.length - 1; if (actual.length >= index) { - Class type = formal[index].getComponentType(); + Class<?> type = formal[index].getComponentType(); actual = handleVarArg(type, index, actual); } } @@ -573,14 +579,14 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware { if (isVarArg == null) { - Class[] formal = method.getParameterTypes(); - if (formal == null || formal.length == 0) + Class<?>[] formal = method.getParameterTypes(); + if (formal.length == 0) { this.isVarArg = Boolean.FALSE; } else { - Class last = formal[formal.length - 1]; + Class<?> last = formal[formal.length - 1]; // if the last arg is an array, then // we consider this a varargs method this.isVarArg = last.isArray(); @@ -599,7 +605,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @return The actual parameters adjusted for the varargs in order * to fit the method declaration. */ - private Object[] handleVarArg(final Class type, + private Object[] handleVarArg(final Class<?> type, final int index, Object[] actual) { @@ -617,7 +623,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware else if (actual.length == index + 1 && actual[index] != null) { // make sure the last arg is an array of the expected type - Class argClass = actual[index].getClass(); + Class<?> argClass = actual[index].getClass(); if (!argClass.isArray() && IntrospectionUtils.isMethodInvocationConvertible(type, argClass, false)) { // create a 1-length array to hold and replace the last param @@ -651,6 +657,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelMethod#isCacheable() */ + @Override public boolean isCacheable() { return true; @@ -659,6 +666,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelMethod#getMethodName() */ + @Override public String getMethodName() { return method.getName(); @@ -667,6 +675,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelMethod#getMethod() */ + @Override public Method getMethod() { return method; @@ -675,7 +684,8 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelMethod#getReturnType() */ - public Class getReturnType() + @Override + public Class<?> getReturnType() { return method.getReturnType(); } @@ -705,6 +715,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelPropertyGet#invoke(java.lang.Object) */ + @Override public Object invoke(Object o) throws IllegalAccessException, InvocationTargetException { @@ -714,6 +725,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelPropertyGet#isCacheable() */ + @Override public boolean isCacheable() { return true; @@ -722,6 +734,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelPropertyGet#getMethodName() */ + @Override public String getMethodName() { return getExecutor.isAlive() ? getExecutor.getMethod().getName() : null; @@ -755,6 +768,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware * @param value in the Value to set. * @return The resulting Object. */ + @Override public Object invoke(final Object o, final Object value) throws IllegalAccessException, InvocationTargetException { @@ -764,6 +778,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelPropertySet#isCacheable() */ + @Override public boolean isCacheable() { return true; @@ -772,6 +787,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware /** * @see org.apache.velocity.util.introspection.VelPropertySet#getMethodName() */ + @Override public String getMethodName() { return setExecutor.isAlive() ? setExecutor.getMethod().getName() : null; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java index 8eb5cbff..59ef91cb 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.util.introspection; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,8 +19,6 @@ * under the License. */ -package org.apache.velocity.util.introspection; - import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.node.PublicFieldExecutor; import org.apache.velocity.runtime.parser.node.SetPublicFieldExecutor; @@ -53,6 +53,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware * makes sure that the log gets set before this is called, * we can initialize the Introspector using the log object. */ + @Override public void init() { introspector = new Introspector(log); @@ -65,6 +66,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware * @param i * @return A Velocity Getter Method. */ + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i) { if (obj == null) @@ -72,7 +74,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware return null; } - Class claz = obj.getClass(); + Class<?> claz = obj.getClass(); PublicFieldExecutor executor = new PublicFieldExecutor(log, introspector, claz, identifier); @@ -87,6 +89,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware * @param i * @return A Velocity Setter method. */ + @Override public VelPropertySet getPropertySet(Object obj, String identifier, Object arg, Info i) { if (obj == null) @@ -94,7 +97,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware return null; } - Class claz = obj.getClass(); + Class<?> claz = obj.getClass(); SetPublicFieldExecutor executor = new SetPublicFieldExecutor(log, introspector, claz, identifier, arg); @@ -106,6 +109,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware * @param info * @return iterator */ + @Override public Iterator getIterator(Object obj, Info info) { return null; @@ -118,6 +122,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware * @param info * @return method wrapper */ + @Override public VelMethod getMethod(Object obj, String method, Object[] args, Info info) { return null; @@ -126,6 +131,7 @@ public class UberspectPublicFields implements Uberspect, RuntimeServicesAware /** * @param rs RuntimeServices object assigned during initialization */ + @Override public void setRuntimeServices(RuntimeServices rs) { log = rs.getLog("rendering"); diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java index 14e2a2a8..6c8869bd 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java @@ -70,5 +70,5 @@ public interface VelMethod * returns the return type of the method invoked * @return The return type of the method invoked */ - Class getReturnType(); + Class<?> getReturnType(); } diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java index d010cfec..abfe75cc 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java @@ -86,6 +86,7 @@ public class AbsoluteFileResourceLoaderTestCase extends BaseTestCase /** * Runs the test. */ + @Override public void runTest () { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java index 0db00c09..877b93ac 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java @@ -19,23 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import junit.framework.TestCase; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.StringResourceLoader; -import org.apache.velocity.runtime.resource.util.StringResourceRepository; -import org.apache.velocity.test.misc.TestLogger; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.Locale; - /** * Base test case that provides utility methods for * the rest of the tests. diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java index 54d53065..ceb82e80 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java @@ -50,7 +50,7 @@ public class ArrayMethodsTestCase extends BaseTestCase checkResults(array, 11, false); // test an array of mixed objects, including null - array = new Object[] { new Double(2.2), null }; + array = new Object[] { 2.2, null }; checkResults(array, "whatever", true); // then set all the values to null checkResults(array, null, true); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java index f2eb297d..c6456dff 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java @@ -80,6 +80,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase return ret; } + @Override protected void setUp() throws Exception { //by default, make the engine's log output go to the test-report @@ -124,6 +125,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase getStringRepository().removeStringResource(name); } + @Override public void tearDown() { engine = null; @@ -225,7 +227,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase /** * Ensure that a specified type of exception occurs when evaluating the string. */ - protected Exception assertEvalException(String evil, Class exceptionType) + protected Exception assertEvalException(String evil, Class<?> exceptionType) { try { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java index 206875b3..0f0cb616 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java @@ -31,6 +31,7 @@ public class BreakDirectiveTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty("a.provide.scope.control", "true"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java index ad946418..63e10676 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java @@ -92,6 +92,7 @@ public class BuiltInEventHandlerTestCase extends BaseTestCase { super(name); } + @Override public void setUp() throws Exception { assureResultsDirectoryExists(RESULTS_DIR); @@ -410,7 +411,7 @@ public class BuiltInEventHandlerTestCase extends BaseTestCase { assertEquals("Jimmy's <b>pizza</b>",writer.toString()); // comment out bad test -- requires latest commons-lang - /** + /* // JavaScript and HTML writer = new StringWriter(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java index d6f7b2d3..096dbe7b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java @@ -53,6 +53,7 @@ public class ClassloaderChangeTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { @@ -159,6 +160,7 @@ public class ClassloaderChangeTestCase extends TestCase } + @Override public Class<?> findClass(String name) { return fooClass; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java index 98c20fb5..41285fab 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java @@ -74,6 +74,7 @@ public class ClasspathResourceTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java index 3697a292..f427f4f7 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java @@ -33,11 +33,13 @@ public class ContextAutoreferenceKeyTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty(VelocityEngine.CONTEXT_AUTOREFERENCE_KEY, "self"); } + @Override protected void setUpContext(VelocityContext context) { context.put("foo", "bar"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java index 859108cb..a30c2940 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java @@ -53,6 +53,7 @@ public class ContextSafetyTestCase extends BaseTestCase implements TemplateTestB super(name); } + @Override public void setUp() throws Exception { @@ -81,11 +82,11 @@ public class ContextSafetyTestCase extends BaseTestCase implements TemplateTestB * make a Vector and String array because * they are treated differently in Foreach() */ - Vector v = new Vector(); + Vector<String> v = new Vector(); - v.addElement( new String("vector hello 1") ); - v.addElement( new String("vector hello 2") ); - v.addElement( new String("vector hello 3") ); + v.addElement("vector hello 1"); + v.addElement( "vector hello 2"); + v.addElement( "vector hello 3"); String strArray[] = new String[3]; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java index 141d7180..bc056222 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java @@ -30,6 +30,7 @@ import java.io.BufferedWriter; import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; /** * Tests input encoding handling. The input target is UTF-8, having @@ -48,6 +49,7 @@ public class EncodingTestCase extends BaseTestCase implements TemplateTestBase super(name); } + @Override public void setUp() throws Exception { @@ -94,7 +96,7 @@ public class EncodingTestCase extends BaseTestCase implements TemplateTestBase new FileOutputStream ( getFileName(RESULT_DIR, "encodingtest", RESULT_FILE_EXT)); - Writer writer = new BufferedWriter(new OutputStreamWriter(fos, "UTF-8")); + Writer writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8)); template.merge(context, writer); writer.flush(); @@ -125,7 +127,7 @@ public class EncodingTestCase extends BaseTestCase implements TemplateTestBase new FileOutputStream ( getFileName(RESULT_DIR, "encodingtest2", RESULT_FILE_EXT)); - Writer writer = new BufferedWriter(new OutputStreamWriter(fos, "UTF-8")); + Writer writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8)); template.merge(context, writer); writer.flush(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java index cc961996..fc5c1d1b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java @@ -33,7 +33,6 @@ import java.io.OutputStreamWriter; import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; /** @@ -85,6 +84,7 @@ public class EvaluateTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java index a0ba2704..ef3bfcdf 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java @@ -52,7 +52,7 @@ public class EventHandlingTestCase extends BaseTestCase throws Exception { TestEventCartridge te = new TestEventCartridge(); - /** + /* * Test attaching the event cartridge to the context. * Make an event cartridge, register all the * event handlers (at once) and attach it to the @@ -186,7 +186,8 @@ public class EventHandlingTestCase extends BaseTestCase /** * Required by EventHandler */ - public void setRuntimeServices( RuntimeServices rs ) + @Override + public void setRuntimeServices(RuntimeServices rs ) { // make sure this is only called once if (this.rs == null) @@ -199,7 +200,8 @@ public class EventHandlingTestCase extends BaseTestCase /** * Event handler for when a reference is inserted into the output stream. */ - public Object referenceInsert( Context context, String reference, Object value ) + @Override + public Object referenceInsert(Context context, String reference, Object value ) { // as a test, make sure this EventHandler is initialized if (rs == null) @@ -233,7 +235,8 @@ public class EventHandlingTestCase extends BaseTestCase /** * Handles exceptions thrown during in-template method access */ - 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 ) { // as a test, make sure this EventHandler is initialized if (rs == null) @@ -259,6 +262,7 @@ public class EventHandlingTestCase extends BaseTestCase Context context; + @Override public void setContext(Context context) { this.context = context; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java index 44ef1fd5..2816799a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java @@ -32,6 +32,7 @@ public class ExpressionAsMethodArgumentTestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("tool",new MyAbsTool()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java index 82995217..e56fa733 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java @@ -101,7 +101,7 @@ public class FilteredEventHandlingTestCase extends BaseTestCase assureResultsDirectoryExists(RESULTS_DIR); - /** + /* * Set up two VelocityEngines that will apply the handlers in both orders */ VelocityEngine ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java index e1fdce19..e4ccc7f9 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java @@ -19,7 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; /** @@ -33,6 +32,7 @@ public class HyphenInIdentifiersTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.addProperty("parser.allow_hyphen_in_identifiers", true); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java index 2f6832b0..2935100c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java @@ -22,13 +22,7 @@ package org.apache.velocity.test; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; /** * Used to check that empty values are properly handled in #if statements diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java index d34a53ec..f1ce938d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java @@ -31,6 +31,7 @@ public class IfNullTestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("nullToString", new NullToString()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java index ee8ee945..a242d05f 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java @@ -58,6 +58,7 @@ public class IncludeErrorTestCase extends BaseTestCase implements TemplateTestBa return new TestSuite(IncludeErrorTestCase.class); } + @Override public void setUp() throws Exception { ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java index 91396a54..720ffc5c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java @@ -92,6 +92,7 @@ public class IncludeEventHandlingTestCase extends BaseTestCase implements Includ super(name); } + @Override public void setUp() throws Exception { @@ -197,14 +198,16 @@ public class IncludeEventHandlingTestCase extends BaseTestCase implements Includ } - public void setRuntimeServices( RuntimeServices rs ) + @Override + public void setRuntimeServices(RuntimeServices rs ) { } /** * Sample handler with different behaviors for the different tests. */ - public String includeEvent( Context context, String includeResourcePath, String currentResourcePath, String directiveName) + @Override + public String includeEvent(Context context, String includeResourcePath, String currentResourcePath, String directiveName) { if (EventHandlerBehavior == PASS_THROUGH) return includeResourcePath; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java index aac83c78..a585de7e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java @@ -33,6 +33,7 @@ public class IndexTestCase extends BaseTestCase //DEBUG = true; } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java index 89bcbb8e..0ca5a150 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java @@ -58,6 +58,7 @@ public class InfoTestCase extends BaseTestCase implements TemplateTestBase return new TestSuite(InfoTestCase.class); } + @Override public void setUp() throws Exception { ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java index 455db88c..acaafba9 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java @@ -46,6 +46,7 @@ public class InlineScopeVMTestCase extends BaseTestCase implements TemplateTestB super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java index 9c365241..bbd4bfab 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java @@ -43,6 +43,7 @@ public class IntrospectionCacheDataTestCase extends TestCase { public int cacheHit = 0; + @Override public IntrospectionCacheData icacheGet(Object key) { final IntrospectionCacheData result = super.icacheGet(key); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java index 788c4b54..ec2fec2b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java @@ -44,6 +44,7 @@ public class IntrospectorTestCase extends BaseTestCase private Introspector introspector; + @Override public void setUp() { mp = new MethodProvider(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java index d9db73b5..48ba8e61 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java @@ -99,7 +99,7 @@ extends TestCase { TestEventCartridge te = new TestEventCartridge(); - /** + /* * Test attaching the event cartridge to the context */ VelocityEngine ve = new VelocityEngine(); @@ -131,7 +131,6 @@ extends TestCase /** * Test assigning the event handlers via properties */ - public void testConfigurationEventHandlers() throws Exception { @@ -472,7 +471,8 @@ extends TestCase /** * Required by EventHandler */ - public void setRuntimeServices( RuntimeServices rs ) + @Override + public void setRuntimeServices(RuntimeServices rs ) { // make sure this is only called once if (this.rs == null) @@ -483,6 +483,7 @@ extends TestCase } + @Override public Object invalidGetMethod(Context context, String reference, Object object, String property, Info info) { // as a test, make sure this EventHandler is initialized @@ -493,7 +494,7 @@ extends TestCase { // good object, bad property case "$a1.foobar": - assertEquals(new Integer(5), object); + assertEquals(Integer.valueOf(5), object); assertEquals("foobar", property); throw new RuntimeException("expected exception"); @@ -548,6 +549,7 @@ extends TestCase return null; } + @Override public Object invalidMethod(Context context, String reference, Object object, String method, Info info) { // as a test, make sure this EventHandler is initialized @@ -576,6 +578,7 @@ extends TestCase } + @Override public boolean invalidSetMethod(Context context, String leftreference, String rightreference, Info info) { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java index 0a00d5d7..d8f12dde 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java @@ -43,6 +43,7 @@ public class MacroAutoReloadTestCase extends BaseTestCase super(name); } + @Override protected void setUp() throws Exception { // always copy macros library before modifying it, to ensure successive tests will pass diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java index 38822fdf..3a38f9e4 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java @@ -31,6 +31,7 @@ public class MacroCommentsTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java index 12a77eb0..368991f4 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java @@ -31,6 +31,7 @@ public class MacroDefaultArgTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java index c7ac7f74..5a9fb8da 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java @@ -69,6 +69,7 @@ public class MacroForwardDefineTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java index 37b54e72..43436f0b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java @@ -20,7 +20,6 @@ package org.apache.velocity.test; */ import junit.framework.TestCase; -import org.apache.commons.io.filefilter.FalseFileFilter; import org.apache.commons.lang3.ArrayUtils; import org.apache.velocity.runtime.parser.node.ASTMethod; @@ -55,7 +54,7 @@ public class MethodCacheKeyTestCase extends TestCase assertFalse(mck1.equals(mck4)); - /** check for potential NPE's **/ + /* check for potential NPE's */ Class [] elements5 = ArrayUtils.EMPTY_CLASS_ARRAY; ASTMethod.MethodCacheKey mck5 = new ASTMethod.MethodCacheKey("boo",elements5, false); selfEqualsAssertions(mck5); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java index 4c1c7d59..34f4d813 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java @@ -48,6 +48,7 @@ public class MethodInvocationExceptionTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java index 98b5629e..711481c8 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java @@ -84,6 +84,7 @@ public class MethodOverloadingTestCase extends BaseTestCase super(name); } + @Override public void setUp() { assureResultsDirectoryExists(RESULTS_DIR); @@ -97,7 +98,7 @@ public class MethodOverloadingTestCase extends BaseTestCase public void testMethodOverloading() throws Exception { - /** + /* * test overloading in a single template */ testFile("single"); @@ -108,7 +109,7 @@ public class MethodOverloadingTestCase extends BaseTestCase public void testParsedMethodOverloading() throws Exception { - /** + /* * test overloading in a file included with #parse */ testFile("main"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java index 0520e5ad..dc7d67aa 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java @@ -79,6 +79,7 @@ public class MultiLoaderTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java index aeed8414..c3cd32f3 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java @@ -76,6 +76,7 @@ public class MultipleFileResourcePathTestCase extends BaseTestCase return new TestSuite(MultipleFileResourcePathTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java index 25b6d55b..2a24d39a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java @@ -53,6 +53,7 @@ public class NumberMethodCallsTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java index 4bbcbe2a..46c3b06d 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java @@ -55,6 +55,7 @@ public class OldPropertiesTestCase extends TestCase implements TemplateTestBase super(name); } + @Override public void setUp() throws Exception { @@ -98,7 +99,7 @@ public class OldPropertiesTestCase extends TestCase implements TemplateTestBase // check getting old/new values List<String> oldPropSettings = FileUtils.readLines(new File(oldProperties)); - Set<String> oldKeys = new HashSet<String>(); + Set<String> oldKeys = new HashSet<>(); for (String oldProp : oldPropSettings) { Matcher matcher = propPattern.matcher(oldProp); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java index fd214e4b..5dd2bd24 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java @@ -53,6 +53,7 @@ public class ParseExceptionTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { Velocity.reset(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java index ba566e0e..1b83d5f4 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.test; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.test; import junit.framework.TestSuite; import org.apache.velocity.Template; @@ -45,6 +46,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -149,7 +151,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase Template template = ve.getTemplate("parseMacro1.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -241,7 +243,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase Template template = ve1.getTemplate("parseMacro2.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -291,7 +293,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase Template template = ve1.getTemplate("parseMacro3.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java index c67b8dc3..13f2266a 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java @@ -32,6 +32,7 @@ public class PropertyMethodPrecedenceTestCase extends BaseTestCase // DEBUG = true; } + @Override protected void setUpContext(VelocityContext context) { context.put("geta", new getGetgetisTool()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java index 4cbf9d0d..74288393 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java @@ -93,6 +93,7 @@ public class RenderVelocityTemplateTest { List<Throwable> errors = new ArrayList<>(); + @Override public void uncaughtException(Thread t, Throwable e) { errors.add(e); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java index 006bcd64..4ca9a5a6 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java @@ -51,6 +51,7 @@ public class ResourceCachingTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java index 50460214..0c50219d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java @@ -40,6 +40,7 @@ public class ResourceExistsTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { try { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java index 6ef03e62..e6217b0c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java @@ -84,6 +84,7 @@ public class ResourceLoaderInstanceTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java index d9c08ba9..21a6490d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java @@ -34,6 +34,7 @@ public class ScopeTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty("a.provide.scope.control", "true"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java index 130ed937..e6794800 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java @@ -74,6 +74,7 @@ public class SetTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); @@ -87,12 +88,12 @@ public class SetTestCase extends BaseTestCase public void testSetNull() throws Exception { - /** + /* * Check that #set does accept nulls */ checkTemplate("set1"); - /** + /* * Check that #set can accept nulls, and has the correct behaviour for complex LHS */ checkTemplate("set2"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java index 69f88697..e8d22bdf 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.test; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.test; import junit.framework.TestSuite; import org.apache.velocity.Template; @@ -46,6 +47,7 @@ public class SpaceGobblingTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -117,7 +119,7 @@ public class SpaceGobblingTestCase extends BaseTestCase Template template = ve.getTemplate(templateFile); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java index 7768fb25..f09a53d0 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java @@ -33,6 +33,7 @@ public class StopDirectiveTestCase extends BaseTestCase //DEBUG=true; } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java index d9c7a824..d5c7ff4e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java @@ -45,6 +45,7 @@ public class StrictAlternateValuesTestCase extends BaseTestCase engine.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, Boolean.TRUE); } + @Override protected void setUpContext(VelocityContext context) { context.put("foo", null); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java index 6c556286..5174f248 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java @@ -33,6 +33,7 @@ public class StrictCompareTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java index 846e992e..b3ab04a6 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java @@ -31,6 +31,7 @@ public class StrictEscapeTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java index 333790a8..3632016b 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java @@ -35,6 +35,7 @@ public class StrictForeachTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java index 2695ede0..4515a899 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java @@ -32,6 +32,7 @@ public class StrictMathTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java index 86abcb19..5a6b6d17 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java @@ -39,6 +39,7 @@ public class StrictReferenceTestCase extends BaseTestCase // second engine to test WITH conversions VelocityEngine engine2; + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java index c8d7c16b..f86e06c4 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java @@ -30,6 +30,7 @@ public class StringConcatenationTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java index 5216527e..23aee4ce 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java @@ -47,6 +47,7 @@ public class StringResourceLoaderRepositoryTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { Velocity.reset(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java index a5bcf37d..69c09bb5 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java @@ -64,6 +64,7 @@ public class StringResourceLoaderTestCase extends BaseTestCase return new TestSuite(StringResourceLoaderTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java index bdf24cfc..99a4eacf 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java @@ -101,6 +101,7 @@ public class TemplateTestCase extends BaseTestCase implements TemplateTestBase /** * Sets up the test. */ + @Override protected void setUp () throws Exception { @@ -186,7 +187,7 @@ public class TemplateTestCase extends BaseTestCase implements TemplateTestBase // Add a TemplateNumber context.put ("templatenumber1", new TestNumber (999.125)); - /** + /* * Test #foreach() with a list containing nulls */ ArrayList nullList = new ArrayList(); @@ -203,6 +204,7 @@ public class TemplateTestCase extends BaseTestCase implements TemplateTestBase /** * Runs the test. */ + @Override public void runTest () throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java index 2c2abc3b..775a75b3 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java @@ -50,6 +50,7 @@ public class URLResourceLoaderTimeoutTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java index f0e495a0..4e243c3b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java @@ -47,6 +47,7 @@ public class UberspectorTestCase return new TestSuite(UberspectorTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java index 87ac8546..dde8cbd7 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java @@ -61,6 +61,7 @@ public class VMLibraryTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -70,7 +71,7 @@ public class VMLibraryTestCase extends BaseTestCase ve1.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.TRUE); ve1.setProperty("velocimacro.permissions.allow.inline.to.replace.global", Boolean.FALSE); - /** + /* * Turn on the cache */ ve1.setProperty("file.resource.loader.cache", Boolean.TRUE); @@ -83,13 +84,13 @@ public class VMLibraryTestCase extends BaseTestCase TEST_COMPARE_DIR + "/macrolibs"); ve1.init(); - /** + /* * Set to global namespaces */ ve2.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.FALSE); ve2.setProperty("velocimacro.permissions.allow.inline.to.replace.global", Boolean.TRUE); - /** + /* * Turn on the cache */ ve2.setProperty("file.resource.loader.cache", Boolean.FALSE); @@ -108,14 +109,14 @@ public class VMLibraryTestCase extends BaseTestCase return new TestSuite(VMLibraryTestCase.class); } - /** + /* * Runs the tests with local namespace. */ public void testVelociMacroLibWithLocalNamespace() throws Exception { assureResultsDirectoryExists(RESULT_DIR); - /** + /* * Clear the file before proceeding */ File file = new File(getFileName( @@ -125,7 +126,7 @@ public class VMLibraryTestCase extends BaseTestCase file.delete(); } - /** + /* * Create a file output stream for appending */ FileOutputStream fos = new FileOutputStream (getFileName( @@ -140,7 +141,7 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library_local.vm"); template.merge(context, writer, templateList); - /** + /* * remove the first template library and includes a new library * with a new definition for macros */ @@ -157,13 +158,13 @@ public class VMLibraryTestCase extends BaseTestCase assertEquals("Both templates refer to the same object", t1, t2); - /** + /* * Remove the libraries */ template = ve1.getTemplate("vm_library_local.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -176,14 +177,14 @@ public class VMLibraryTestCase extends BaseTestCase } } - /** + /* * Runs the tests with global namespace. */ public void testVelociMacroLibWithGlobalNamespace() throws Exception { assureResultsDirectoryExists(RESULT_DIR); - /** + /* * Clear the file before proceeding */ File file = new File(getFileName( @@ -193,7 +194,7 @@ public class VMLibraryTestCase extends BaseTestCase file.delete(); } - /** + /* * Create a file output stream for appending */ FileOutputStream fos = new FileOutputStream (getFileName( @@ -208,7 +209,7 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library_global.vm"); template.merge(context, writer, templateList); - /** + /* * remove the first template library and includes a new library * with a new definition for macros */ @@ -225,7 +226,7 @@ public class VMLibraryTestCase extends BaseTestCase assertNotSame("Defferent objects", t1, t2); - /** + /* * Write to the file */ writer.flush(); @@ -238,14 +239,14 @@ public class VMLibraryTestCase extends BaseTestCase } } - /** + /* * Runs the tests with global namespace. */ public void testVelociMacroLibWithDuplicateDefinitions() throws Exception { assureResultsDirectoryExists(RESULT_DIR); - /** + /* * Clear the file before proceeding */ File file = new File(getFileName( @@ -255,7 +256,7 @@ public class VMLibraryTestCase extends BaseTestCase file.delete(); } - /** + /* * Create a file output stream for appending */ FileOutputStream fos = new FileOutputStream (getFileName( @@ -271,7 +272,7 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library.vm"); template.merge(context, writer, templateList); - /** + /* * Write to the file */ writer.flush(); @@ -284,7 +285,7 @@ public class VMLibraryTestCase extends BaseTestCase } } - /** + /* * Test whether the literal text is given if a definition cannot be * found for a macro. * @@ -304,13 +305,13 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library.vm"); template.merge(context, writer, null); - /** + /* * Write to the file */ writer.flush(); writer.close(); - /** + /* * outputs the macro calls */ if (!isMatch(RESULT_DIR, COMPARE_DIR, "vm_library", diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java index c1286b65..a87bba8e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java @@ -31,6 +31,7 @@ public class VarargMethodsTestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("nice", new NiceTool()); @@ -206,6 +207,7 @@ public class VarargMethodsTestCase extends BaseTestCase return "string"; } + @Override public String test(Object[] array) { return "object[]"; @@ -230,7 +232,7 @@ public class VarargMethodsTestCase extends BaseTestCase { o.append(", "); } - o.append(String.valueOf(array[i])); + o.append((array[i])); } o.append("]"); return o.toString(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java index 72a27c15..e41fe434 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java @@ -44,6 +44,7 @@ public class VelocimacroBCModeTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { boolean bcMode = !getName().contains("NoPreserve"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java index 56dbe5e7..445cf44a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java @@ -48,6 +48,7 @@ public class VelocimacroTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java index 0db5b426..1c8bd11f 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java @@ -52,6 +52,7 @@ public class WrappedExceptionTestCase extends BaseTestCase implements TemplateTe return new TestSuite(WrappedExceptionTestCase.class); } + @Override public void setUp() throws Exception { ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java index 02c5f94d..52220557 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java @@ -39,6 +39,7 @@ public class Handler1 /** * display output twice, once uppercase and once lowercase */ + @Override public Object referenceInsert(Context context, String reference, Object value) { if (value == null) @@ -50,7 +51,8 @@ public class Handler1 /** * throw the exception */ - 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) { throw new RuntimeException(e); } @@ -58,6 +60,7 @@ public class Handler1 /* * redirect all requests to a page "login.vm" (simulates access control). */ + @Override public String includeEvent( Context context, String includeResourcePath, diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java index eeb1a173..033c9655 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java @@ -39,6 +39,7 @@ public class Handler2 /** * convert output to upper case */ + @Override public Object referenceInsert(Context context, String reference, Object value) { if (value == null) @@ -50,7 +51,8 @@ public class Handler2 /** * print the exception */ - 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) { return "Exception: " + e; } @@ -58,6 +60,7 @@ public class Handler2 /* * redirect all requests to a new directory "subdir" (simulates localization). */ + @Override public String includeEvent( Context context, String includeResourcePath, diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java index 04a926a6..3906f6c2 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java @@ -50,6 +50,7 @@ public class VelTools66TestCase return new TestSuite(VelTools66TestCase.class); } + @Override public void setUp() throws Exception { @@ -70,6 +71,7 @@ public class VelTools66TestCase } } + @Override public void tearDown() { System.setSecurityManager(null); @@ -114,11 +116,13 @@ public class VelTools66TestCase { } + @Override public String getTestValue() { return testValue; } + @Override public void setTestValue(final String testValue) { this.testValue = testValue; @@ -127,14 +131,14 @@ public class VelTools66TestCase public static final class TestSecurityManager extends SecurityManager { - private final Class clazz = TestObject.class; + private final Class<?> clazz = TestObject.class; public TestSecurityManager() { super(); } - public void checkMemberAccess(final Class c, final int i) + public void checkMemberAccess(final Class<?> c, final int i) { log("checkMemberAccess(" + c.getName() + ", " + i + ")"); @@ -144,21 +148,25 @@ public class VelTools66TestCase } } + @Override public void checkRead(final String file) { log("checkRead(" + file + ")"); } + @Override public void checkPackageAccess(final String s) { log("checkPackageAccess(" + s + ")"); } + @Override public void checkPropertyAccess(final String s) { log("checkPropertyAccess(" + s + ")"); } + @Override public void checkPermission(final Permission p) { log("checkPermission(" + p + ")"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java index 1371cf73..02ee5efb 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java @@ -66,6 +66,7 @@ public class Velocity537TestCase extends BaseTestCase } private VelocityEngine velocityEngine; + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java index d393bee2..1018208c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java @@ -20,12 +20,11 @@ package org.apache.velocity.test.issues; */ import junit.framework.Test; -import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.velocity.test.BaseTestCase; /** - * @see https://issues.apache.org/jira/browse/VELOCITY-544 + * @see <a href="https://issues.apache.org/jira/browse/VELOCITY-544">VELOCITY-544</a> */ public class Velocity544TestCase extends BaseTestCase diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java index 78667761..3918178a 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java @@ -55,6 +55,7 @@ public class Velocity579TestCase extends BaseTestCase private static abstract class FooImpl implements Foo { + @Override public String foo(String s) { return s == null ? "foo" : s; @@ -71,6 +72,7 @@ public class Velocity579TestCase extends BaseTestCase public static class MyBar extends Foobar { + @Override public String bar() { return super.bar(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java index 3ae4a8b7..14904163 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java @@ -65,6 +65,7 @@ public class Velocity580TestCase extends BaseTestCase return new TestSuite(Velocity580TestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java index b58b508b..fec7796d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java @@ -31,6 +31,7 @@ public class Velocity615TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java index 9c801762..e2974e26 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java @@ -31,6 +31,7 @@ public class Velocity616TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java index cce590fd..faff4cad 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java @@ -34,6 +34,7 @@ public class Velocity627TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java index 1861f7dc..e76a18bd 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java @@ -31,6 +31,7 @@ public class Velocity62TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java index 3b8b8281..99289433 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java @@ -31,6 +31,7 @@ public class Velocity631TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java index 0aba2c26..9e74fe24 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java @@ -33,6 +33,7 @@ public class Velocity644TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java index 3f6aeeab..7ff2ddf8 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java @@ -33,6 +33,7 @@ public class Velocity689TestCase extends BaseTestCase //DEBUG = true; } + @Override public void setUpContext(VelocityContext ctx) { ctx.put("foo", new Foo()); @@ -61,11 +62,13 @@ public class Velocity689TestCase extends BaseTestCase private static class Foo implements NoMethod { + @Override public String getBar() { return "bar"; } + @Override public String getBaz() { return "baz"; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java index eb3dbde9..69bbf21e 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java @@ -35,6 +35,7 @@ public class Velocity701TestCase extends BaseTestCase public void testAbstractClass() { context.put("foo", new Foo() { + @Override public String getBar() { return "bar"; } @@ -57,6 +58,7 @@ public class Velocity701TestCase extends BaseTestCase public enum Bar { ONE(){ + @Override public String getFoo() { return "foo"; } diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java index f22497c1..ed74c6e3 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java @@ -35,6 +35,7 @@ public class Velocity702TestCase extends BaseTestCase super(name); } + @Override public void setUpEngine(VelocityEngine engine) { engine.setProperty(RuntimeConstants.RESOURCE_LOADERS, "high,low"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java index fe3034ec..45b7dfde 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java @@ -33,6 +33,7 @@ public class Velocity742TestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { // we need to call init here because otherwise it is not called until assertEvalEquals diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java index ca817562..5dba3633 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java @@ -43,6 +43,7 @@ public class Velocity747TestCase extends BaseTestCase VelocityEngine engine1; VelocityEngine engine2; + @Override protected void setUp() throws Exception { Properties props = new Properties(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java index 12c48f6c..4c8d84c2 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java @@ -53,6 +53,7 @@ public class Velocity758TestCase extends BaseTestCase public static class Handler implements IncludeEventHandler { + @Override public String includeEvent(Context context, String parsePath, String parentPath, String directive) { if (parsePath == null) diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java index 6dcf2f6e..5d2c94da 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java @@ -33,6 +33,7 @@ public class Velocity855TestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("elementKind", javax.lang.model.element.ElementKind.class); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java index 2ed509e5..33397cfc 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java @@ -1,21 +1,7 @@ package org.apache.velocity.test.issues; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.test.BaseTestCase; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.StringWriter; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.apache.velocity.test.TemplateTestBase.FILE_RESOURCE_LOADER_PATH; - public class Velocity919TestCase extends BaseTestCase { public Velocity919TestCase(String name) diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java index af1a9c62..5c1ee041 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java @@ -37,6 +37,7 @@ public class Velocity924TestCase extends BaseTestCase public String getName() { return "foo"; } } + @Override protected void setUpContext(VelocityContext context) { context.put("var", new Foo()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java index 1a335507..41a33213 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java @@ -19,7 +19,6 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.VelocityContext; import org.apache.velocity.test.BaseTestCase; /** diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java index 5d68d244..0717310a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java @@ -38,16 +38,19 @@ import java.io.Writer; */ public class ExceptionGeneratingDirective extends Directive { + @Override public String getName() { return "Exception"; } + @Override public int getType() { return Directive.BLOCK; } + @Override public boolean render(InternalContextAdapter context, Writer writer, Node node) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java index 9353d85f..037594ac 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java @@ -36,14 +36,17 @@ public class ExceptionGeneratingEventHandler implements IncludeEventHandler, MethodExceptionEventHandler, ReferenceInsertionEventHandler { + @Override public String includeEvent(Context context, String includeResourcePath, String currentResourcePath, - String directiveName) + String directiveName) { throw new RuntimeException("exception"); } - public Object methodException(Context context, Class claz, String method, Exception e, Info info) { throw new RuntimeException("exception"); } + @Override + public Object methodException(Context context, Class<?> claz, String method, Exception e, Info info) { throw new RuntimeException("exception"); } + @Override public Object referenceInsert(Context context, String reference, Object value) { throw new RuntimeException("exception"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java index b5d0e975..fef7adb3 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java @@ -36,20 +36,24 @@ import java.io.Reader; public class ExceptionGeneratingResourceLoader extends ResourceLoader { + @Override public void init(ExtProperties configuration) { } + @Override public Reader getResourceReader(String source, String encoding) throws ResourceNotFoundException { throw new RuntimeException("exception"); } + @Override public boolean isSourceModified(Resource resource) { return false; } + @Override public long getLastModified(Resource resource) { return 0; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java index 03c50224..4b8e3bda 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java @@ -38,21 +38,25 @@ public class TestContext implements Context Context innerContext = new VelocityContext(); Map<String, String> originalKeys = new HashMap<>(); + @Override public boolean containsKey(String key) { return innerContext.containsKey(normalizeKey(key)); } + @Override public Object get(String key) { return innerContext.get(normalizeKey(key)); } + @Override public String[] getKeys() { return originalKeys.values().toArray(new String[originalKeys.size()]); } + @Override public Object put(String key, Object value) { String normalizedKey = normalizeKey(key); @@ -60,6 +64,7 @@ public class TestContext implements Context return innerContext.put(normalizedKey, value); } + @Override public Object remove(String key) { originalKeys.remove(key); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java index 5cba573c..e7a4e990 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java @@ -163,166 +163,196 @@ public class TestLogger extends MarkerIgnoringBase * Logging API */ + @Override public boolean isTraceEnabled() { return isLevelEnabled(LOG_LEVEL_TRACE); } + @Override public void trace(String msg) { log(LOG_LEVEL_TRACE, msg, null); } + @Override public void trace(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_TRACE, ft.getMessage(), ft.getThrowable()); } + @Override public void trace(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_TRACE, ft.getMessage(), ft.getThrowable()); } + @Override public void trace(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_TRACE, ft.getMessage(), ft.getThrowable()); } + @Override public void trace(String msg, Throwable t) { log(LOG_LEVEL_TRACE, msg, t); } + @Override public boolean isDebugEnabled() { return isLevelEnabled(LOG_LEVEL_DEBUG); } + @Override public void debug(String msg) { log(LOG_LEVEL_DEBUG, msg, null); } + @Override public void debug(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_DEBUG, ft.getMessage(), ft.getThrowable()); } + @Override public void debug(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_DEBUG, ft.getMessage(), ft.getThrowable()); } + @Override public void debug(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_DEBUG, ft.getMessage(), ft.getThrowable()); } + @Override public void debug(String msg, Throwable t) { log(LOG_LEVEL_DEBUG, msg, t); } + @Override public boolean isInfoEnabled() { return isLevelEnabled(LOG_LEVEL_INFO); } + @Override public void info(String msg) { log(LOG_LEVEL_INFO, msg, null); } + @Override public void info(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_INFO, ft.getMessage(), ft.getThrowable()); } + @Override public void info(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_INFO, ft.getMessage(), ft.getThrowable()); } + @Override public void info(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_INFO, ft.getMessage(), ft.getThrowable()); } + @Override public void info(String msg, Throwable t) { log(LOG_LEVEL_INFO, msg, t); } + @Override public boolean isWarnEnabled() { return isLevelEnabled(LOG_LEVEL_WARN); } + @Override public void warn(String msg) { log(LOG_LEVEL_WARN, msg, null); } + @Override public void warn(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_WARN, ft.getMessage(), ft.getThrowable()); } + @Override public void warn(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_WARN, ft.getMessage(), ft.getThrowable()); } + @Override public void warn(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_WARN, ft.getMessage(), ft.getThrowable()); } + @Override public void warn(String msg, Throwable t) { log(LOG_LEVEL_WARN, msg, t); } + @Override public boolean isErrorEnabled() { return isLevelEnabled(LOG_LEVEL_ERROR); } + @Override public void error(String msg) { log(LOG_LEVEL_ERROR, msg, null); } + @Override public void error(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_ERROR, ft.getMessage(), ft.getThrowable()); } + @Override public void error(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_ERROR, ft.getMessage(), ft.getThrowable()); } + @Override public void error(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_ERROR, ft.getMessage(), ft.getThrowable()); } + @Override public void error(String msg, Throwable t) { log(LOG_LEVEL_ERROR, msg, t); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java index f41fc6d7..71a96a4a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java @@ -53,6 +53,7 @@ public class UberspectTestException extends RuntimeException return info; } + @Override public String getMessage() { return super.getMessage() + "\n failed at " + info; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java index 0bdb6baa..b07f6725 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java @@ -31,6 +31,7 @@ import org.apache.velocity.util.introspection.VelPropertyGet; public class UberspectTestImpl extends UberspectImpl { + @Override public VelMethod getMethod(Object obj, String methodName, Object[] args, Info i) { VelMethod method = super.getMethod(obj, methodName, args, i); @@ -46,6 +47,7 @@ public class UberspectTestImpl extends UberspectImpl return method; } + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i) { VelPropertyGet propertyGet = super.getPropertyGet(obj, identifier, i); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java index d6b30e3a..6515c752 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java @@ -29,6 +29,7 @@ package org.apache.velocity.test.provider; */ public class Child extends Person { + @Override public String getName() { return "Child"; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java index 35491918..5850eec5 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java @@ -37,6 +37,7 @@ public class TestNumber implements TemplateNumber n = val; } + @Override public Number getAsNumber() { return n; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java index 44ed270b..60eea81f 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java @@ -125,9 +125,9 @@ public class TestProvider for (int i = 0; i < 3; i++) { Hashtable item = new Hashtable(); - item.put("id", "item" + Integer.toString(i+1)); - item.put("name", "name" + Integer.toString(i+1)); - item.put("label", "label" + Integer.toString(i+1)); + item.put("id", "item" + (i+1)); + item.put("name", "name" + (i+1)); + item.put("label", "label" + (i+1)); //al.add(item); menu[i] = item; } diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java index ac57df45..4acef0f8 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java @@ -26,7 +26,6 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; import java.sql.Statement; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java index 3f63a6bc..757b6e84 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java @@ -83,6 +83,7 @@ public class DataSourceResourceLoaderTestCase return new TestSuite(DataSourceResourceLoaderTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java index da825f48..286cfc2a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java @@ -46,48 +46,57 @@ public class TestDataSource implements DataSource Class.forName(driverClass); } + @Override public Connection getConnection() throws SQLException { return DriverManager.getConnection(url, user, password); } + @Override public Connection getConnection(final String username, final String password) throws SQLException { return DriverManager.getConnection(url, username, password); } + @Override public PrintWriter getLogWriter() throws SQLException { return logWriter; } + @Override public int getLoginTimeout() throws SQLException { return loginTimeout; } + @Override public void setLogWriter(final PrintWriter logWriter) throws SQLException { this.logWriter = logWriter; } + @Override public void setLoginTimeout(final int loginTimeout) throws SQLException { this.loginTimeout = loginTimeout; } + @Override public boolean isWrapperFor(final Class iface) throws SQLException { return false; } + @Override public Object unwrap(final Class iface) throws SQLException { throw new SQLException("Not implemented"); } /* added to be able to compile with jdk 1.7+ */ + @Override public Logger getParentLogger() throws SQLFeatureNotSupportedException { throw new SQLFeatureNotSupportedException(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java index 1c81776b..2687d662 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java @@ -49,6 +49,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { return new TestSuite(ChainedUberspectorsTestCase.class); } + @Override public void setUp() throws Exception { @@ -60,6 +61,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { Velocity.init(); } + @Override public void tearDown() { } @@ -88,6 +90,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { // replaces getFoo by getBar public static class ChainedUberspector extends AbstractChainableUberspector { + @Override public VelPropertySet getPropertySet(Object obj, String identifier, Object arg, Info info) { identifier = identifier.replaceAll("foo","bar"); @@ -98,6 +101,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { // replaces setFoo by setBar public static class LinkedUberspector extends UberspectImpl { + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info info) { identifier = identifier.replaceAll("foo","bar"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java index ddaa9456..be0a1e31 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java @@ -44,6 +44,7 @@ public class ClassMapTestCase return new TestSuite(ClassMapTestCase.class); } + @Override public void setUp() throws Exception { @@ -51,6 +52,7 @@ public class ClassMapTestCase Velocity.init(); } + @Override public void tearDown() { } diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java index 66a1c8c4..a006a547 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.test.util.introspection; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.test.util.introspection; import junit.framework.TestSuite; import org.apache.commons.lang3.StringUtils; @@ -67,6 +68,7 @@ public class ConversionHandlerTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -175,19 +177,19 @@ public class ConversionHandlerTestCase extends BaseTestCase }; @Override - public boolean isExplicitlyConvertible(Type formal, Class actual, boolean possibleVarArg) + public boolean isExplicitlyConvertible(Type formal, Class<?> actual, boolean possibleVarArg) { return true; } @Override - public Converter getNeededConverter(Type formal, Class actual) + public Converter<?> getNeededConverter(Type formal, Class<?> actual) { return myCustomConverter; } @Override - public void addConverter(Type formal, Class actual, Converter converter) + public void addConverter(Type formal, Class<?> actual, Converter<?> converter) { throw new RuntimeException("not implemented"); } @@ -239,7 +241,7 @@ public class ConversionHandlerTestCase extends BaseTestCase Template template = ve.getTemplate(templateFile); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -296,6 +298,7 @@ public class ConversionHandlerTestCase extends BaseTestCase public static class PrintException implements MethodExceptionEventHandler { + @Override public Object methodException(Context context, Class claz, String method, diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java index 1e90f811..6b5b8857 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java @@ -46,6 +46,7 @@ public class DeprecatedCheckUberspectorsTestCase extends BaseTestCase { return new TestSuite(DeprecatedCheckUberspectorsTestCase.class); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty(Velocity.RUNTIME_LOG_INSTANCE, new TestLogger(false, true)); @@ -53,6 +54,7 @@ public class DeprecatedCheckUberspectorsTestCase extends BaseTestCase { engine.addProperty(Velocity.UBERSPECT_CLASSNAME, "org.apache.velocity.util.introspection.DeprecatedCheckUberspector"); } + @Override protected void setUpContext(VelocityContext context) { context.put("obj1", new StandardObject()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java index 97ae07d3..3fbddf22 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java @@ -56,6 +56,7 @@ public class EnumConstantConversionTestCase extends BaseTestCase { } } + @Override protected void setUpContext(VelocityContext context) { context.put("obj", new Obj()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java index 1c706b4f..c074be5e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java @@ -3,13 +3,11 @@ package org.apache.velocity.test.util.introspection; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.test.misc.TestLogger; -import java.io.StringWriter; import java.util.Arrays; import java.util.Iterator; @@ -105,6 +103,7 @@ public class UberspectImplTestCase extends BaseTestCase public class SomeIterable implements Iterable { + @Override public Iterator iterator() { return Arrays.asList("1", "2", "3").iterator(); |