Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java Sat Jan 28 19:21:08 2017 @@ -20,6 +20,7 @@ package org.apache.velocity.test.issues; */ import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.velocity.test.BaseTestCase; @@ -50,7 +51,7 @@ public class Velocity544TestCase String result = evaluate(template); - super.assertEquals("true false true false", result); + assertEquals("true false true false", result); } public static class Foobar @@ -69,7 +70,7 @@ public class Velocity544TestCase public Boolean isTrueObject() { - return(new Boolean(value)); + return(value); } } }
Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java Sat Jan 28 19:21:08 2017 @@ -48,7 +48,7 @@ public class Velocity579TestCase extends assertEvalEquals("bar", "$bar.bar()"); } - public static interface Foo + public interface Foo { String foo(String s); } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java Sat Jan 28 19:21:08 2017 @@ -47,7 +47,7 @@ public class Velocity62TestCase extends public void testRecursive() { - context.put("i", new Integer(1)); + context.put("i", 1); String template = "#macro(recurse $i)"+ "$i"+ "#if( $i < 5 )"+ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java Sat Jan 28 19:21:08 2017 @@ -44,17 +44,17 @@ public class Velocity689TestCase extends assertEvalEquals("baz, bar", template); } - public static interface HasMethod + public interface HasMethod { String getBar(); } - public static interface HasOtherMethod extends HasMethod + public interface HasOtherMethod extends HasMethod { String getBaz(); } - public static interface NoMethod extends HasOtherMethod + public interface NoMethod extends HasOtherMethod { // nada! } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java Sat Jan 28 19:21:08 2017 @@ -54,7 +54,7 @@ public class Velocity701TestCase extends assertEvalEquals("foo", "$bar.foo"); } - public static enum Bar { + public enum Bar { ONE(){ public String getFoo() { Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java Sat Jan 28 19:21:08 2017 @@ -35,7 +35,7 @@ public class Velocity753TestCase extends { // verify precedence outside of Velocity Tool tool = new Tool(); - Float f = new Float(5.23); + Float f = 5.23f; assertEquals("object", tool.test(f)); context.put("tool", tool); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java Sat Jan 28 19:21:08 2017 @@ -35,7 +35,7 @@ import java.util.Map; public class TestContext implements Context { Context innerContext = new VelocityContext(); - Map<String, String> originalKeys = new HashMap<String, String>(); + Map<String, String> originalKeys = new HashMap<>(); public boolean containsKey(String key) { Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java Sat Jan 28 19:21:08 2017 @@ -34,7 +34,7 @@ public class TestNumber implements Templ public TestNumber(double val) { - n = new Double(val); + n = val; } public Number getAsNumber() Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java Sat Jan 28 19:21:08 2017 @@ -60,8 +60,7 @@ public class TestProvider public List getEmptyList() { - List list = new ArrayList(); - return list; + return new ArrayList(); } public List getList() @@ -213,9 +212,9 @@ public class TestProvider { StringBuilder result = new StringBuilder(); - for (int i = 0; i < strings.length; i++) + for (Object string : strings) { - result.append((String) strings[i]).append(' '); + result.append((String) string).append(' '); } return result.toString(); @@ -225,9 +224,9 @@ public class TestProvider { StringBuilder result = new StringBuilder(); - for (int i = 0; i < strings.size(); i++) + for (Object string : strings) { - result.append((String) strings.get(i)).append(' '); + result.append((String) string).append(' '); } return result.toString(); @@ -237,9 +236,9 @@ public class TestProvider { StringBuilder result = new StringBuilder(); - for (int i = 0; i < objects.size(); i++) + for (Object object : objects) { - result.append(objects.get(i)).append(' '); + result.append(object).append(' '); } return result.toString(); @@ -288,8 +287,8 @@ public class TestProvider { int size = list.length; - for (int i = 0; i < size; i++) - if (list[i].toString().length() > 0) + for (Object aList : list) + if (aList.toString().length() > 0) return false; return true; @@ -318,12 +317,12 @@ public class TestProvider public void setBangStart( Integer i ) { System.out.println("SetBangStart() : called with val = " + i ); - stateint = i.intValue(); + stateint = i; } public Integer bang() { System.out.println("Bang! : " + stateint ); - Integer ret = new Integer( stateint ); + Integer ret = stateint; stateint++; return ret; } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java Sat Jan 28 19:21:08 2017 @@ -213,7 +213,7 @@ public class ConversionHandlerTestCase e private VelocityContext createContext() { VelocityContext context = new VelocityContext(); - Map<String, Object> map = new TreeMap<String, Object>(); + Map<String, Object> map = new TreeMap<>(); map.put("A. bool-true", true); map.put("B. bool-false", false); map.put("C. byte-0", (byte)0); @@ -267,7 +267,7 @@ public class ConversionHandlerTestCase e public static class Obj { - public enum Color { RED, GREEN }; + public enum Color { RED, GREEN } public String integralBoolean(boolean b) { return "boolean ok: " + b; } public String integralByte(byte b) { return "byte ok: " + b; } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java Sat Jan 28 19:21:08 2017 @@ -43,7 +43,8 @@ public class EnumConstantConversionTestC public static class Obj { - public enum Color { RED, GREEN }; + public enum Color { RED, GREEN } + public String getAction(Color color) { switch (color) Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java Sat Jan 28 19:21:08 2017 @@ -47,14 +47,14 @@ public class SimplePoolTestCase extends for (int i=0; i<10; i++) { - sp.put(new Integer(i)); + sp.put(i); } for (int i=9; i>=0; i--) { Integer obj = (Integer) sp.get(); - assertTrue(i == obj.intValue()); + assertTrue(i == obj); } Object[] pool = sp.getPool(); Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java Sat Jan 28 19:21:08 2017 @@ -179,8 +179,6 @@ public class DBContext extends AbstractC { System. out.println(e); } - - return; } } Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java Sat Jan 28 19:21:08 2017 @@ -276,10 +276,7 @@ public class EventExample extends Marker */ public boolean shouldLogOnNullSet( String lhs, String rhs ) { - if (lhs.equals("$settest")) - return false; - - return true; + return !lhs.equals("$settest"); } public Object methodException( Context context, Class claz, String method, Exception e, Info info ) { Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java Sat Jan 28 19:21:08 2017 @@ -88,7 +88,7 @@ public class Example * of the template and the data to produce the output stream. */ - BufferedWriter writer = writer = new BufferedWriter( + BufferedWriter writer = new BufferedWriter( new OutputStreamWriter(System.out)); if ( template != null) Modified: velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java Sat Jan 28 19:21:08 2017 @@ -86,7 +86,7 @@ public class VelocityScriptEngine extend private volatile RuntimeInstance velocityEngine; /** - * contructs a new Velocity script engine, linked to the given factory + * constructs a new Velocity script engine, linked to the given factory * @param factory */ public VelocityScriptEngine(ScriptEngineFactory factory) Modified: velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java?rev=1780734&r1=1780733&r2=1780734&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java Sat Jan 28 19:21:08 2017 @@ -96,7 +96,7 @@ public class VelocityScriptEngineFactory /** * get the list of file extensions handled by Velocity: vm, vtl, vhtml - * @return extentions list + * @return extensions list */ public List<String> getExtensions() { @@ -122,7 +122,7 @@ public class VelocityScriptEngineFactory } /** - * get Velocity syntax for calling method 'm' on bject 'obj' with provided arguments + * get Velocity syntax for calling method 'm' on object 'obj' with provided arguments * @param obj * @param m * @param args @@ -141,10 +141,10 @@ public class VelocityScriptEngineFactory int i = 0; for (; i < args.length - 1; i++) { - buf.append("$" + args[i]); + buf.append("$").append(args[i]); buf.append(", "); } - buf.append("$" + args[i]); + buf.append("$").append(args[i]); } buf.append(")}"); return buf.toString(); @@ -198,9 +198,9 @@ public class VelocityScriptEngineFactory public String getProgram(String... statements) { StringBuilder buf = new StringBuilder(); - for (int i = 0; i < statements.length; i++) + for (String statement : statements) { - buf.append(statements[i]); + buf.append(statement); buf.append(System.lineSeparator()); } return buf.toString();